Original patch by Case from #foobar2000 on Freenode diff -Naur wget-1.16/configure wget-1.16.new/configure --- wget-1.16/configure 2014-10-27 09:57:51.000000000 +0100 +++ wget-1.16.new/configure 2014-11-10 23:36:52.470863633 +0100 @@ -1519,6 +1519,12 @@ EGREP GREP CPP +am__fastdepCXX_FALSE +am__fastdepCXX_TRUE +CXXDEPMODE +ac_ct_CXX +CXXFLAGS +CXX am__fastdepCC_FALSE am__fastdepCC_TRUE CCDEPMODE @@ -1645,6 +1651,9 @@ LDFLAGS LIBS CPPFLAGS +CXX +CXXFLAGS +CCC CPP' @@ -2319,6 +2328,8 @@ LIBS libraries to pass to the linker, e.g. -l CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory + CXX C++ compiler command + CXXFLAGS C++ compiler flags CPP C preprocessor Use these variables to override the choices made by `configure' or to help @@ -2485,6 +2496,44 @@ } # ac_fn_c_try_link +# 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_c_try_cpp LINENO # ---------------------- # Try to preprocess conftest.$ac_ext, and return whether this succeeded. @@ -6074,6 +6123,391 @@ 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 +if test -z "$CXX"; then + if test -n "$CCC"; then + CXX=$CCC + else + if test -n "$ac_tool_prefix"; then + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +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 +done + done +IFS=$as_save_IFS + +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 + + + 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=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +depcc="$CXX" am_compiler_list= + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +$as_echo_n "checking dependency style of $depcc... " >&6; } +if ${am_cv_CXX_dependencies_compiler_type+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + am_cv_CXX_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi + am__universal=false + case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac + + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + # We check with '-c' and '-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" + case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; + nosideeffect) + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; + none) break ;; + esac + if depmode=$depmode \ + source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_CXX_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_CXX_dependencies_compiler_type=none +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5 +$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } +CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type + + if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then + am__fastdepCXX_TRUE= + am__fastdepCXX_FALSE='#' +else + am__fastdepCXX_TRUE='#' + am__fastdepCXX_FALSE= +fi + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -36142,7 +36576,7 @@ case $host_os in *mingw32* ) - LIBS+=' -lws2_32' + LIBS+=' -lws2_32 -lole32' case " $LIBOBJS " in *" mswindows.$ac_objext "* ) ;; *) LIBOBJS="$LIBOBJS mswindows.$ac_objext" @@ -36410,7 +36844,7 @@ else - LIBS+=' -lgdi32' + LIBS+=' -lgdi32 -lcrypt32' fi ;; esac @@ -38444,6 +38878,10 @@ as_fn_error $? "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then + as_fn_error $? "conditional \"am__fastdepCXX\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${GL_COND_LIBTOOL_TRUE}" && test -z "${GL_COND_LIBTOOL_FALSE}"; then as_fn_error $? "conditional \"GL_COND_LIBTOOL\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 diff -Naur wget-1.16/configure.ac wget-1.16.new/configure.ac --- wget-1.16/configure.ac 2014-10-27 09:15:33.000000000 +0100 +++ wget-1.16.new/configure.ac 2014-11-10 23:35:04.832573532 +0100 @@ -110,6 +110,7 @@ AC_PROG_CC AM_PROG_CC_C_O +AC_PROG_CXX AC_AIX gl_EARLY @@ -234,7 +235,7 @@ dnl Deal with specific hosts case $host_os in *mingw32* ) - LIBS+=' -lws2_32' + LIBS+=' -lws2_32 -lole32' AC_LIBOBJ([mswindows]) ;; esac @@ -276,7 +277,7 @@ AC_MSG_ERROR([openssl not found: shared lib eay32 found but ssl32 not found])) else - LIBS+=' -lgdi32' + LIBS+=' -lgdi32 -lcrypt32' dnl fallback and test static libs fi dnl add zdll lib as dep for above tests? diff -Naur wget-1.16/doc/Makefile.in wget-1.16.new/doc/Makefile.in --- wget-1.16/doc/Makefile.in 2014-10-27 09:57:53.000000000 +0100 +++ wget-1.16.new/doc/Makefile.in 2014-11-10 23:36:53.123848953 +0100 @@ -319,6 +319,9 @@ CONFIG_INCLUDE = @CONFIG_INCLUDE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -1192,6 +1195,7 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ diff -Naur wget-1.16/lib/Makefile.in wget-1.16.new/lib/Makefile.in --- wget-1.16/lib/Makefile.in 2014-10-27 09:57:53.000000000 +0100 +++ wget-1.16.new/lib/Makefile.in 2014-11-10 23:36:53.416842367 +0100 @@ -374,6 +374,9 @@ CONFIG_INCLUDE = @CONFIG_INCLUDE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -1247,6 +1250,7 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ diff -Naur wget-1.16/Makefile.in wget-1.16.new/Makefile.in --- wget-1.16/Makefile.in 2014-10-27 09:57:53.000000000 +0100 +++ wget-1.16.new/Makefile.in 2014-11-10 23:36:52.947852910 +0100 @@ -348,6 +348,9 @@ CONFIG_INCLUDE = @CONFIG_INCLUDE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -1221,6 +1224,7 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ diff -Naur wget-1.16/src/Makefile.am wget-1.16.new/src/Makefile.am --- wget-1.16/src/Makefile.am 2014-07-23 09:37:19.000000000 +0200 +++ wget-1.16.new/src/Makefile.am 2014-11-10 23:30:54.356551366 +0100 @@ -53,12 +53,14 @@ http.h http-ntlm.h init.h log.h mswindows.h netrc.h \ options.h progress.h ptimer.h recur.h res.h retr.h \ spider.h ssl.h sysdep.h url.h warc.h utils.h wget.h iri.h \ - exits.h gettext.h + exits.h gettext.h tbprogress.cc tbprogress.h nodist_wget_SOURCES = version.c EXTRA_wget_SOURCES = iri.c LDADD = $(LIBOBJS) ../lib/libgnu.a AM_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib +CXXCOMPILE = $(CXX) $(DEFS) $(AM_CXXFLAGS) $(CXXFLAGS) + ../lib/libgnu.a: cd ../lib && $(MAKE) $(AM_MAKEFLAGS) diff -Naur wget-1.16/src/Makefile.in wget-1.16.new/src/Makefile.in --- wget-1.16/src/Makefile.in 2014-10-27 09:57:53.000000000 +0100 +++ wget-1.16.new/src/Makefile.in 2014-11-10 23:36:53.719835555 +0100 @@ -113,9 +113,8 @@ bin_PROGRAMS = wget$(EXEEXT) subdir = src DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(srcdir)/config.h.in openssl.c gnutls.c http-ntlm.c \ - ftp-opie.c mswindows.c $(top_srcdir)/build-aux/depcomp \ - ChangeLog + $(srcdir)/config.h.in http-ntlm.c mswindows.c ftp-opie.c \ + openssl.c gnutls.c $(top_srcdir)/build-aux/depcomp ChangeLog ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/absolute-header.m4 $(top_srcdir)/m4/alloca.m4 \ @@ -233,7 +232,7 @@ html-url.h http.h http-ntlm.h init.h log.h mswindows.h netrc.h \ options.h progress.h ptimer.h recur.h res.h retr.h spider.h \ ssl.h sysdep.h url.h warc.h utils.h wget.h iri.h exits.h \ - gettext.h test.c test.h + gettext.h tbprogress.cc tbprogress.h test.c test.h @IRI_IS_ENABLED_TRUE@am__objects_1 = libunittest_a-iri.$(OBJEXT) am__objects_2 = libunittest_a-cmpt.$(OBJEXT) \ libunittest_a-connect.$(OBJEXT) \ @@ -253,7 +252,8 @@ libunittest_a-spider.$(OBJEXT) libunittest_a-url.$(OBJEXT) \ libunittest_a-warc.$(OBJEXT) libunittest_a-utils.$(OBJEXT) \ libunittest_a-exits.$(OBJEXT) \ - libunittest_a-build_info.$(OBJEXT) $(am__objects_1) + libunittest_a-build_info.$(OBJEXT) $(am__objects_1) \ + libunittest_a-tbprogress.$(OBJEXT) am_libunittest_a_OBJECTS = $(am__objects_2) \ libunittest_a-test.$(OBJEXT) \ libunittest_a-build_info.$(OBJEXT) @@ -271,7 +271,7 @@ html-url.h http.h http-ntlm.h init.h log.h mswindows.h netrc.h \ options.h progress.h ptimer.h recur.h res.h retr.h spider.h \ ssl.h sysdep.h url.h warc.h utils.h wget.h iri.h exits.h \ - gettext.h + gettext.h tbprogress.cc tbprogress.h @IRI_IS_ENABLED_TRUE@am__objects_3 = iri.$(OBJEXT) am_wget_OBJECTS = cmpt.$(OBJEXT) connect.$(OBJEXT) convert.$(OBJEXT) \ cookies.$(OBJEXT) ftp.$(OBJEXT) css_.$(OBJEXT) \ @@ -281,7 +281,8 @@ main.$(OBJEXT) netrc.$(OBJEXT) progress.$(OBJEXT) \ ptimer.$(OBJEXT) recur.$(OBJEXT) res.$(OBJEXT) retr.$(OBJEXT) \ spider.$(OBJEXT) url.$(OBJEXT) warc.$(OBJEXT) utils.$(OBJEXT) \ - exits.$(OBJEXT) build_info.$(OBJEXT) $(am__objects_3) + exits.$(OBJEXT) build_info.$(OBJEXT) $(am__objects_3) \ + tbprogress.$(OBJEXT) nodist_wget_OBJECTS = version.$(OBJEXT) wget_OBJECTS = $(am_wget_OBJECTS) $(nodist_wget_OBJECTS) wget_LDADD = $(LDADD) @@ -318,6 +319,17 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = +CXXLD = $(CXX) +CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ + -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = SOURCES = $(libunittest_a_SOURCES) $(nodist_libunittest_a_SOURCES) \ $(wget_SOURCES) $(EXTRA_wget_SOURCES) $(nodist_wget_SOURCES) DIST_SOURCES = $(am__libunittest_a_SOURCES_DIST) \ @@ -374,6 +386,9 @@ CONFIG_INCLUDE = @CONFIG_INCLUDE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ # The following line is losing on some versions of make! @@ -1250,6 +1265,7 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -1315,12 +1331,13 @@ http.h http-ntlm.h init.h log.h mswindows.h netrc.h \ options.h progress.h ptimer.h recur.h res.h retr.h \ spider.h ssl.h sysdep.h url.h warc.h utils.h wget.h iri.h \ - exits.h gettext.h + exits.h gettext.h tbprogress.cc tbprogress.h nodist_wget_SOURCES = version.c EXTRA_wget_SOURCES = iri.c LDADD = $(LIBOBJS) ../lib/libgnu.a AM_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib +CXXCOMPILE = $(CXX) $(DEFS) $(AM_CXXFLAGS) $(CXXFLAGS) ESCAPEQUOTE = sed -e 's/[\\"]/\\&/g' -e 's/\\"/"/' -e 's/\\";$$/";/' check_LIBRARIES = libunittest.a libunittest_a_SOURCES = $(wget_SOURCES) test.c build_info.c test.h @@ -1332,7 +1349,7 @@ $(MAKE) $(AM_MAKEFLAGS) all-am .SUFFIXES: -.SUFFIXES: .c .o .obj +.SUFFIXES: .c .cc .o .obj $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -1431,7 +1448,7 @@ wget$(EXEEXT): $(wget_OBJECTS) $(wget_DEPENDENCIES) $(EXTRA_wget_DEPENDENCIES) @rm -f wget$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(wget_OBJECTS) $(wget_LDADD) $(LIBS) + $(AM_V_CXXLD)$(CXXLINK) $(wget_OBJECTS) $(wget_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -1489,6 +1506,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-res.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-retr.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-spider.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-tbprogress.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-test.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-url.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-utils.Po@am__quote@ @@ -1503,6 +1521,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/res.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/retr.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spider.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tbprogress.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/url.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/version.Po@am__quote@ @@ -1970,6 +1989,34 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunittest_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libunittest_a-version.obj `if test -f 'version.c'; then $(CYGPATH_W) 'version.c'; else $(CYGPATH_W) '$(srcdir)/version.c'; fi` +.cc.o: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< + +.cc.obj: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +libunittest_a-tbprogress.o: tbprogress.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunittest_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libunittest_a-tbprogress.o -MD -MP -MF $(DEPDIR)/libunittest_a-tbprogress.Tpo -c -o libunittest_a-tbprogress.o `test -f 'tbprogress.cc' || echo '$(srcdir)/'`tbprogress.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libunittest_a-tbprogress.Tpo $(DEPDIR)/libunittest_a-tbprogress.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tbprogress.cc' object='libunittest_a-tbprogress.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunittest_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libunittest_a-tbprogress.o `test -f 'tbprogress.cc' || echo '$(srcdir)/'`tbprogress.cc + +libunittest_a-tbprogress.obj: tbprogress.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunittest_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libunittest_a-tbprogress.obj -MD -MP -MF $(DEPDIR)/libunittest_a-tbprogress.Tpo -c -o libunittest_a-tbprogress.obj `if test -f 'tbprogress.cc'; then $(CYGPATH_W) 'tbprogress.cc'; else $(CYGPATH_W) '$(srcdir)/tbprogress.cc'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libunittest_a-tbprogress.Tpo $(DEPDIR)/libunittest_a-tbprogress.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tbprogress.cc' object='libunittest_a-tbprogress.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunittest_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libunittest_a-tbprogress.obj `if test -f 'tbprogress.cc'; then $(CYGPATH_W) 'tbprogress.cc'; else $(CYGPATH_W) '$(srcdir)/tbprogress.cc'; fi` + ID: $(am__tagged_files) $(am__define_uniq_tagged_files); mkid -fID $$unique tags: tags-am diff -Naur wget-1.16/src/mswindows.c wget-1.16.new/src/mswindows.c --- wget-1.16/src/mswindows.c 2014-06-28 12:57:24.000000000 +0200 +++ wget-1.16.new/src/mswindows.c 2014-11-10 21:34:48.326072751 +0100 @@ -43,6 +43,7 @@ #include "utils.h" #include "url.h" #include "exits.h" +#include "tbprogress.h" #ifndef ES_SYSTEM_REQUIRED #define ES_SYSTEM_REQUIRED 0x00000001 @@ -89,6 +90,7 @@ static void ws_cleanup (void) { + SetTBProgress(-1); xfree ((char*)exec_name); WSACleanup (); } @@ -402,6 +404,7 @@ sprintf (title_buf, "Wget [%d%%] %s", percentage, curr_url); SetConsoleTitle (title_buf); + SetTBProgress((int)(percentage_float * 10.0)); } /* Returns a pointer to the fully qualified name of the directory that diff -Naur wget-1.16/src/tbprogress.cc wget-1.16.new/src/tbprogress.cc --- wget-1.16/src/tbprogress.cc 1970-01-01 01:00:00.000000000 +0100 +++ wget-1.16.new/src/tbprogress.cc 2014-11-11 08:43:48.797857758 +0100 @@ -0,0 +1,112 @@ +#ifndef _WIN32_WINNT +#define _WIN32_WINNT 0x0500 +#endif + +#include +#include +#include +#include +#include "tbprogress.h" + +const GUID CLSID_TaskbarList = {0x56FDF344,0xFD6D,0x11d0,{0x95,0x8A,0x00,0x60,0x97,0xC9,0xA0,0x90}}; +const GUID IID_ITaskbarList1 = {0x56FDF342,0xFD6D,0x11d0,{0x95,0x8A,0x00,0x60,0x97,0xC9,0xA0,0x90}}; +const GUID IID_ITaskbarList3 = {0xea1afb91,0x9e28,0x4b86,{0x90,0xe9,0x9e,0x9f,0x8a,0x5e,0xef,0xaf}}; + +#ifndef __ITaskbarList3_INTERFACE_DEFINED__ +enum TBPFLAG { + TBPF_NOPROGRESS = 0, // Normal state / no progress bar + TBPF_INDETERMINATE = 1, // Marquee style progress bar + TBPF_NORMAL = 2, // Standard progress bar + TBPF_ERROR = 4, // Red taskbar button to indicate an error occurred + TBPF_PAUSED = 8 // Yellow taskbar button to indicate user attention +}; + +typedef void* LPTHUMBBUTTON;//dummy typedef! +enum TBATFLAG {TBATF_DUMMY}; + +class ITaskbarList3 : public IUnknown +{ +public: + virtual STDMETHODIMP QueryInterface(REFIID riid, void **ppv); + virtual STDMETHODIMP_(ULONG) AddRef(); + virtual STDMETHODIMP_(ULONG) Release(); + //ITaskbarList(1) + virtual STDMETHODIMP HrInit(); + virtual STDMETHODIMP AddTab(HWND hwnd); + virtual STDMETHODIMP DeleteTab(HWND hwnd); + virtual STDMETHODIMP ActivateTab(HWND hwnd); + virtual STDMETHODIMP SetActiveAlt(HWND hwnd); + //ITaskbarList2 + virtual STDMETHODIMP MarkFullscreenWindow(HWND hwnd,BOOL fFullscreen); + //ITaskbarList3 + virtual STDMETHODIMP SetProgressValue(HWND hwnd,ULONGLONG ullCompleted, ULONGLONG ullTotal); + virtual STDMETHODIMP SetProgressState(HWND hwnd,TBPFLAG tbpFlags); + virtual STDMETHODIMP RegisterTab(HWND hwndTab, HWND hwndMDI); + virtual STDMETHODIMP UnregisterTab(HWND hwndTab); + virtual STDMETHODIMP SetTabOrder(HWND hwndTab,HWND hwndInsertBefore); + virtual STDMETHODIMP SetTabActive(HWND hwndTab,HWND hwndMDI, TBATFLAG tbatFlags); + virtual STDMETHODIMP ThumbBarAddButtons(HWND hwnd,UINT cButtons, LPTHUMBBUTTON pButton); + virtual STDMETHODIMP ThumbBarUpdateButtons(HWND hwnd,UINT cButtons, LPTHUMBBUTTON pButton); + virtual STDMETHODIMP ThumbBarSetImageList(HWND hwnd,HIMAGELIST himl); + virtual STDMETHODIMP SetOverlayIcon(HWND hwnd,HICON hIcon, LPCWSTR pszDescription); + virtual STDMETHODIMP SetThumbnailTooltip(HWND hwnd,LPCWSTR pszTip); + virtual STDMETHODIMP SetThumbnailClip(HWND hwnd,RECT *prcClip); + //ITaskbarList4 + //virtual STDMETHODIMP SetTabProperties(HWND hwndTab,STPFLAG stpFlags); +}; +#endif + +ITaskbarList3 *g_pTL = NULL; +HWND g_hwndConsole = NULL; +int TB_status = 0; + +extern "C" void SetTBProgress(int permille) +{ + if (g_pTL == NULL && permille < 0) return; + if (TB_status != 0) return; + if (permille > 1000) permille = 1000; + + if (g_pTL == NULL) { + HRESULT hr; + + g_hwndConsole = GetConsoleWindow(); + if (g_hwndConsole == NULL) { + TB_status = -1; + return; + } + + hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + if (!SUCCEEDED(hr)) { + CoUninitialize(); + TB_status = -1; + return; + } + + CoCreateInstance(CLSID_TaskbarList, NULL, CLSCTX_INPROC_SERVER, IID_ITaskbarList3, (void**)&g_pTL); + if (g_pTL == NULL) { + CoUninitialize(); + TB_status = -1; + return; + } + + hr = g_pTL->HrInit(); + if (!SUCCEEDED(hr)) { + TB_status = -1; + g_pTL->Release(); + g_pTL = NULL; + CoUninitialize(); + return; + } + + TB_status = 0; + } + + if (permille >= 0) { + g_pTL->SetProgressValue(g_hwndConsole, permille, 1000); + } else { + g_pTL->SetProgressState(g_hwndConsole, TBPF_NOPROGRESS); + g_pTL->Release(); + g_pTL=NULL; + CoUninitialize(); + } +} diff -Naur wget-1.16/src/tbprogress.h wget-1.16.new/src/tbprogress.h --- wget-1.16/src/tbprogress.h 1970-01-01 01:00:00.000000000 +0100 +++ wget-1.16.new/src/tbprogress.h 2014-11-10 21:36:44.476969471 +0100 @@ -0,0 +1,14 @@ +#ifndef tbprogress_h +#define tbprogress_h + +#ifdef __cplusplus +extern "C" { +#endif + +extern void SetTBProgress(int permille); // 0 - 1000 + +#ifdef __cplusplus +} +#endif + +#endif diff -Naur wget-1.16/testenv/Makefile.in wget-1.16.new/testenv/Makefile.in --- wget-1.16/testenv/Makefile.in 2014-10-27 09:57:54.000000000 +0100 +++ wget-1.16.new/testenv/Makefile.in 2014-11-10 23:36:53.889831733 +0100 @@ -455,6 +455,9 @@ CONFIG_INCLUDE = @CONFIG_INCLUDE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -1328,6 +1331,7 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ diff -Naur wget-1.16/tests/Makefile.in wget-1.16.new/tests/Makefile.in --- wget-1.16/tests/Makefile.in 2014-10-27 09:57:54.000000000 +0100 +++ wget-1.16.new/tests/Makefile.in 2014-11-10 23:36:54.037828406 +0100 @@ -485,6 +485,9 @@ CONFIG_INCLUDE = @CONFIG_INCLUDE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -1358,6 +1361,7 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ diff -Naur wget-1.16/util/Makefile.in wget-1.16.new/util/Makefile.in --- wget-1.16/util/Makefile.in 2014-10-27 09:57:54.000000000 +0100 +++ wget-1.16.new/util/Makefile.in 2014-11-10 23:36:54.170825416 +0100 @@ -259,6 +259,9 @@ CONFIG_INCLUDE = @CONFIG_INCLUDE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -1132,6 +1135,7 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@