Explorar el Código

删除无用文件

zzj hace 6 años
padre
commit
81f0a55371

+ 2 - 0
.gitignore

@@ -12,6 +12,8 @@
 *.status
 autom4te.cache/
 autom4te.cache/*
+websocket/autom4te.cache/
+websocket/autom4te.cache/*
 /.deps/
 /bak/
 test

+ 0 - 59
autoscan.log

@@ -1,59 +0,0 @@
-autoscan: warning: missing AC_CHECK_FUNCS([alarm]) wanted by: 
-	module_service/module_call_help.h:115
-autoscan: warning: missing AC_CHECK_FUNCS([atexit]) wanted by: 
-	main.cpp:181
-autoscan: warning: missing AC_CHECK_FUNCS([clock_gettime]) wanted by: 
-	clock.h:50
-	clock.h:55
-	clock.h:61
-	clock.h:77
-autoscan: warning: missing AC_CHECK_FUNCS([floor]) wanted by: 
-	monkey_car/monkey_fit.h:93
-autoscan: warning: missing AC_CHECK_FUNCS([ftime]) wanted by: 
-	timestamp.h:16
-autoscan: warning: missing AC_CHECK_FUNCS([gettimeofday]) wanted by: 
-	timestamp.h:12
-	net-service.cpp:55
-autoscan: warning: missing AC_CHECK_FUNCS([localtime_r]) wanted by: 
-	message_file.cpp:94
-	common_tool.h:64
-	common_tool.h:137
-	loc_point.cpp:39
-autoscan: warning: missing AC_CHECK_FUNCS([memmove]) wanted by: 
-	znet.cpp:333
-autoscan: warning: missing AC_CHECK_FUNCS([pow]) wanted by: 
-	message.cpp:57
-	src/internal/sio_client_impl.cpp:338
-autoscan: warning: missing AC_CHECK_FUNCS([realpath]) wanted by: 
-	test.cpp:289
-autoscan: warning: missing AC_CHECK_FUNCS([sqrt]) wanted by: 
-	line.h:65
-	line.h:75
-	line.h:144
-	ant.h:255
-	point.h:95
-	point.h:102
-	point.h:109
-	point.h:129
-	monkey_car/base_data.h:52
-autoscan: warning: missing AC_CHECK_FUNCS([strchr]) wanted by: 
-	znet.cpp:157
-autoscan: warning: missing AC_CHECK_FUNCS([strstr]) wanted by: 
-	web-client.cpp:76
-autoscan: warning: missing AC_CHECK_HEADERS([float.h]) wanted by: 
-	monkey_car/linear_fit.h:8
-autoscan: warning: missing AC_CHECK_HEADERS([limits.h]) wanted by: 
-	test.cpp:2
-autoscan: warning: missing AC_CHECK_HEADERS([sys/time.h]) wanted by: 
-	common_tool.h:14
-	timestamp.h:5
-	net-service.cpp:13
-autoscan: warning: missing AC_CHECK_HEADERS([sys/timeb.h]) wanted by: 
-	timestamp.h:3
-autoscan: warning: missing AC_FUNC_MKTIME wanted by: 
-	message_file.cpp:134
-	common_tool.h:74
-	common_tool.h:83
-	common_tool.h:96
-	websocket/wsTimerThread.cpp:82
-	websocket/wsTimerThread.cpp:82

+ 0 - 944
db/aclocal.m4

@@ -1,944 +0,0 @@
-# generated automatically by aclocal 1.12.3 -*- Autoconf -*-
-
-# Copyright (C) 1996-2012 Free Software Foundation, Inc.
-
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-m4_ifndef([AC_AUTOCONF_VERSION],
-  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
-[m4_warning([this file was generated for autoconf 2.69.
-You have another version of autoconf.  It may work, but is not guaranteed to.
-If you have problems, you may need to regenerate the build system entirely.
-To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-
-# Copyright (C) 2002-2012 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-# (This private macro should not be called outside this file.)
-AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.12'
-dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
-dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.12.3], [],
-      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
-])
-
-# _AM_AUTOCONF_VERSION(VERSION)
-# -----------------------------
-# aclocal traces this macro to find the Autoconf version.
-# This is a private macro too.  Using m4_define simplifies
-# the logic in aclocal, which can simply ignore this definition.
-m4_define([_AM_AUTOCONF_VERSION], [])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
-# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.12.3])dnl
-m4_ifndef([AC_AUTOCONF_VERSION],
-  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
-
-# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
-
-# Copyright (C) 2001-2012 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to '$srcdir/foo'.  In other projects, it is set to
-# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
-#
-# Of course, Automake must honor this variable whenever it calls a
-# tool from the auxiliary directory.  The problem is that $srcdir (and
-# therefore $ac_aux_dir as well) can be either absolute or relative,
-# depending on how configure is run.  This is pretty annoying, since
-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-# source directory, any form will work fine, but in subdirectories a
-# relative path needs to be adjusted first.
-#
-# $ac_aux_dir/missing
-#    fails when called from a subdirectory if $ac_aux_dir is relative
-# $top_srcdir/$ac_aux_dir/missing
-#    fails if $ac_aux_dir is absolute,
-#    fails when called from a subdirectory in a VPATH build with
-#          a relative $ac_aux_dir
-#
-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-# are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is '.', but things will broke when you
-# start a VPATH build or use an absolute $srcdir.
-#
-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
-#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-# and then we would define $MISSING as
-#   MISSING="\${SHELL} $am_aux_dir/missing"
-# This will work as long as MISSING is not called from configure, because
-# unfortunately $(top_srcdir) has no meaning in configure.
-# However there are other variables, like CC, which are often used in
-# configure, and could therefore not use this "fixed" $ac_aux_dir.
-#
-# Another solution, used here, is to always expand $ac_aux_dir to an
-# absolute PATH.  The drawback is that using absolute paths prevent a
-# configured tree to be moved without reconfiguration.
-
-AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-])
-
-# AM_CONDITIONAL                                            -*- Autoconf -*-
-
-# Copyright (C) 1997-2012 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-# -------------------------------------
-# Define a conditional.
-AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ([2.52])dnl
- m4_if([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-       [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])dnl
-AC_SUBST([$1_FALSE])dnl
-_AM_SUBST_NOTMAKE([$1_TRUE])dnl
-_AM_SUBST_NOTMAKE([$1_FALSE])dnl
-m4_define([_AM_COND_VALUE_$1], [$2])dnl
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi
-AC_CONFIG_COMMANDS_PRE(
-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-  AC_MSG_ERROR([[conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.]])
-fi])])
-
-# Copyright (C) 1999-2012 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-
-# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery.  Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-
-# _AM_DEPENDENCIES(NAME)
-# ----------------------
-# See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
-# We try a few techniques and use that to set a single cache variable.
-#
-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-# dependency, and given that the user is not expected to run this macro,
-# just rely on AC_PROG_CC.
-AC_DEFUN([_AM_DEPENDENCIES],
-[AC_REQUIRE([AM_SET_DEPDIR])dnl
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-AC_REQUIRE([AM_DEP_TRACK])dnl
-
-m4_if([$1], [CC],   [depcc="$CC"   am_compiler_list=],
-      [$1], [CXX],  [depcc="$CXX"  am_compiler_list=],
-      [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-      [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
-      [$1], [UPC],  [depcc="$UPC"  am_compiler_list=],
-      [$1], [GCJ],  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                    [depcc="$$1"   am_compiler_list=])
-
-AC_CACHE_CHECK([dependency style of $depcc],
-               [am_cv_$1_dependencies_compiler_type],
-[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_$1_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
-  m4_case([$1], [CC],
-    [case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac],
-    [CXX],
-    [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_$1_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_$1_dependencies_compiler_type=none
-fi
-])
-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-AM_CONDITIONAL([am__fastdep$1], [
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-])
-
-
-# AM_SET_DEPDIR
-# -------------
-# Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
-AC_DEFUN([AM_SET_DEPDIR],
-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-])
-
-
-# AM_DEP_TRACK
-# ------------
-AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE([dependency-tracking], [dnl
-AS_HELP_STRING(
-  [--enable-dependency-tracking],
-  [do not reject slow dependency extractors])
-AS_HELP_STRING(
-  [--disable-dependency-tracking],
-  [speeds up one-time build])])
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-  am__nodep='_no'
-fi
-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])dnl
-_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
-AC_SUBST([am__nodep])dnl
-_AM_SUBST_NOTMAKE([am__nodep])dnl
-])
-
-# Generate code to set up dependency tracking.              -*- Autoconf -*-
-
-# Copyright (C) 1999-2012 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-
-# _AM_OUTPUT_DEPENDENCY_COMMANDS
-# ------------------------------
-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[{
-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
-  # are listed without --file.  Let's play safe and only enable the eval
-  # if we detect the quoting.
-  case $CONFIG_FILES in
-  *\'*) eval set x "$CONFIG_FILES" ;;
-  *)   set x $CONFIG_FILES ;;
-  esac
-  shift
-  for mf
-  do
-    # Strip MF so we end up with the name of the file.
-    mf=`echo "$mf" | sed -e 's/:.*$//'`
-    # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named 'Makefile.in', but
-    # some people rename them; so instead we look at the file content.
-    # Grep'ing the first line is not enough: some people post-process
-    # each Makefile.in and add a new line on top of each file to say so.
-    # Grep'ing the whole file is not good either: AIX grep has a line
-    # limit of 2048, but all sed's we know have understand at least 4000.
-    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-      dirpart=`AS_DIRNAME("$mf")`
-    else
-      continue
-    fi
-    # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running 'make'.
-    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-    test -z "$DEPDIR" && continue
-    am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "am__include" && continue
-    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # Find all dependency output files, they are included files with
-    # $(DEPDIR) in their names.  We invoke sed twice because it is the
-    # simplest approach to changing $(DEPDIR) to its actual value in the
-    # expansion.
-    for file in `sed -n "
-      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
-      # Make sure the directory exists.
-      test -f "$dirpart/$file" && continue
-      fdir=`AS_DIRNAME(["$file"])`
-      AS_MKDIR_P([$dirpart/$fdir])
-      # echo "creating $dirpart/$file"
-      echo '# dummy' > "$dirpart/$file"
-    done
-  done
-}
-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-
-
-# AM_OUTPUT_DEPENDENCY_COMMANDS
-# -----------------------------
-# This macro should only be invoked once -- use via AC_REQUIRE.
-#
-# This code is only required when automatic dependency tracking
-# is enabled.  FIXME.  This creates each '.P' file that we will
-# need in order to bootstrap the dependency handling code.
-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-[AC_CONFIG_COMMANDS([depfiles],
-     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
-
-# Do all the work for Automake.                             -*- Autoconf -*-
-
-# Copyright (C) 1996-2012 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This macro actually does too much.  Some checks are only needed if
-# your package does certain things.  But this isn't really a big deal.
-
-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-# AM_INIT_AUTOMAKE([OPTIONS])
-# -----------------------------------------------
-# The call with PACKAGE and VERSION arguments is the old style
-# call (pre autoconf-2.50), which is being phased out.  PACKAGE
-# and VERSION should now be passed to AC_INIT and removed from
-# the call to AM_INIT_AUTOMAKE.
-# We support both call styles for the transition.  After
-# the next Automake release, Autoconf can make the AC_INIT
-# arguments mandatory, and then we can depend on a new Autoconf
-# release and drop the old call support.
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.62])dnl
-dnl Autoconf wants to disallow AM_ names.  We explicitly allow
-dnl the ones we care about.
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])dnl
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
-  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-  # is not polluted with repeated "-I."
-  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
-  # test to see if srcdir already configured
-  if test -f $srcdir/config.status; then
-    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-  fi
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-AC_SUBST([CYGPATH_W])
-
-# Define the identity of the package.
-dnl Distinguish between old-style and new-style calls.
-m4_ifval([$2],
-[AC_DIAGNOSE([obsolete],
-[$0: two- and three-arguments forms are deprecated.  For more info, see:
-http://www.gnu.org/software/automake/manual/automake.html#Modernize-AM_INIT_AUTOMAKE-invocation])
-m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
- AC_SUBST([PACKAGE], [$1])dnl
- AC_SUBST([VERSION], [$2])],
-[_AM_SET_OPTIONS([$1])dnl
-dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(
-  m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
-  [ok:ok],,
-  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-
-_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
- AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
-
-# Some tools Automake needs.
-AC_REQUIRE([AM_SANITY_CHECK])dnl
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
-AM_MISSING_PROG([AUTOCONF], [autoconf])
-AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
-AM_MISSING_PROG([AUTOHEADER], [autoheader])
-AM_MISSING_PROG([MAKEINFO], [makeinfo])
-AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-# For better backward compatibility.  To be removed once Automake 1.9.x
-# dies out for good.  For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
-AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
-	      [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-			     [_AM_PROG_TAR([v7])])])
-_AM_IF_OPTION([no-dependencies],,
-[AC_PROVIDE_IFELSE([AC_PROG_CC],
-		  [_AM_DEPENDENCIES([CC])],
-		  [m4_define([AC_PROG_CC],
-			     m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_CXX],
-		  [_AM_DEPENDENCIES([CXX])],
-		  [m4_define([AC_PROG_CXX],
-			     m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-		  [_AM_DEPENDENCIES([OBJC])],
-		  [m4_define([AC_PROG_OBJC],
-			     m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
-dnl Support for Objective C++ was only introduced in Autoconf 2.65,
-dnl but we still cater to Autoconf 2.62.
-m4_ifdef([AC_PROG_OBJCXX],
-[AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
-		  [_AM_DEPENDENCIES([OBJCXX])],
-		  [m4_define([AC_PROG_OBJCXX],
-			     m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])])dnl
-])
-_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
-dnl The 'parallel-tests' driver may need to know about EXEEXT, so add the
-dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
-dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
-AC_CONFIG_COMMANDS_PRE(dnl
-[m4_provide_if([_AM_COMPILER_EXEEXT],
-  [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
-])
-
-dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
-dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
-dnl mangled by Autoconf and run in a shell conditional statement.
-m4_define([_AC_COMPILER_EXEEXT],
-m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
-
-
-# When config.status generates a header, we must update the stamp-h file.
-# This file resides in the same directory as the config header
-# that is generated.  The stamp files are numbered to have different names.
-
-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-# loop where config.status creates the headers, so we can generate
-# our stamp files there.
-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-[# Compute $1's index in $config_headers.
-_am_arg=$1
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $_am_arg | $_am_arg:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-
-# Copyright (C) 2001-2012 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_INSTALL_SH
-# ------------------
-# Define $install_sh.
-AC_DEFUN([AM_PROG_INSTALL_SH],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-if test x"${install_sh}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
-  *)
-    install_sh="\${SHELL} $am_aux_dir/install-sh"
-  esac
-fi
-AC_SUBST([install_sh])])
-
-# Copyright (C) 2003-2012 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# Check whether the underlying file-system supports filenames
-# with a leading dot.  For instance MS-DOS doesn't.
-AC_DEFUN([AM_SET_LEADING_DOT],
-[rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
-
-# Check to see how 'make' treats includes.	            -*- Autoconf -*-
-
-# Copyright (C) 2001-2012 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_MAKE_INCLUDE()
-# -----------------
-# Check to see how make treats includes.
-AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo this is the am__doit target
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from 'make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
-  am__include=include
-  am__quote=
-  _am_result=GNU
-  ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   case `$am_make -s -f confmf 2> /dev/null` in #(
-   *the\ am__doit\ target*)
-     am__include=.include
-     am__quote="\""
-     _am_result=BSD
-     ;;
-   esac
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
-
-# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
-
-# Copyright (C) 1997-2012 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_MISSING_PROG(NAME, PROGRAM)
-# ------------------------------
-AC_DEFUN([AM_MISSING_PROG],
-[AC_REQUIRE([AM_MISSING_HAS_RUN])
-$1=${$1-"${am_missing_run}$2"}
-AC_SUBST($1)])
-
-# AM_MISSING_HAS_RUN
-# ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
-AC_DEFUN([AM_MISSING_HAS_RUN],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([missing])dnl
-if test x"${MISSING+set}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-  *)
-    MISSING="\${SHELL} $am_aux_dir/missing" ;;
-  esac
-fi
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  AC_MSG_WARN(['missing' script is too old or missing])
-fi
-])
-
-# Helper functions for option handling.                     -*- Autoconf -*-
-
-# Copyright (C) 2001-2012 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# _AM_MANGLE_OPTION(NAME)
-# -----------------------
-AC_DEFUN([_AM_MANGLE_OPTION],
-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-
-# _AM_SET_OPTION(NAME)
-# --------------------
-# Set option NAME.  Presently that only means defining a flag for this option.
-AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
-
-# _AM_SET_OPTIONS(OPTIONS)
-# ------------------------
-# OPTIONS is a space-separated list of Automake options.
-AC_DEFUN([_AM_SET_OPTIONS],
-[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-
-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-# -------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-AC_DEFUN([_AM_IF_OPTION],
-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-
-# Check to make sure that the build environment is sane.    -*- Autoconf -*-
-
-# Copyright (C) 1996-2012 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_SANITY_CHECK
-# ---------------
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Reject unsafe characters in $srcdir or the absolute working directory
-# name.  Accept space and tab only in the latter.
-am_lf='
-'
-case `pwd` in
-  *[[\\\"\#\$\&\'\`$am_lf]]*)
-    AC_MSG_ERROR([unsafe absolute working directory name]);;
-esac
-case $srcdir in
-  *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
-    AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
-esac
-
-# Do 'set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   am_has_slept=no
-   for am_try in 1 2; do
-     echo "timestamp, slept: $am_has_slept" > conftest.file
-     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-     if test "$[*]" = "X"; then
-	# -L didn't work.
-	set X `ls -t "$srcdir/configure" conftest.file`
-     fi
-     if test "$[*]" != "X $srcdir/configure conftest.file" \
-	&& test "$[*]" != "X conftest.file $srcdir/configure"; then
-
-	# If neither matched, then we have a broken ls.  This can happen
-	# if, for instance, CONFIG_SHELL is bash and it inherits a
-	# broken ls alias from the environment.  This has actually
-	# happened.  Such a system could not be considered "sane".
-	AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-  alias in your environment])
-     fi
-     if test "$[2]" = conftest.file || test $am_try -eq 2; then
-       break
-     fi
-     # Just in case.
-     sleep 1
-     am_has_slept=yes
-   done
-   test "$[2]" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-AC_MSG_RESULT([yes])
-# If we didn't sleep, we still need to ensure time stamps of config.status and
-# generated files are strictly newer.
-am_sleep_pid=
-if grep 'slept: no' conftest.file >/dev/null 2>&1; then
-  ( sleep 1 ) &
-  am_sleep_pid=$!
-fi
-AC_CONFIG_COMMANDS_PRE(
-  [AC_MSG_CHECKING([that generated files are newer than configure])
-   if test -n "$am_sleep_pid"; then
-     # Hide warnings about reused PIDs.
-     wait $am_sleep_pid 2>/dev/null
-   fi
-   AC_MSG_RESULT([done])])
-rm -f conftest.file
-])
-
-# Copyright (C) 2001-2012 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_INSTALL_STRIP
-# ---------------------
-# One issue with vendor 'install' (even GNU) is that you can't
-# specify the program used to strip binaries.  This is especially
-# annoying in cross-compiling environments, where the build's strip
-# is unlikely to handle the host's binaries.
-# Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in "make install-strip", and initialize
-# STRIPPROG with the value of the STRIP variable (set by the user).
-AC_DEFUN([AM_PROG_INSTALL_STRIP],
-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using 'strip' when the user
-# run "make install-strip".  However 'strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the 'STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
-if test "$cross_compiling" != no; then
-  AC_CHECK_TOOL([STRIP], [strip], :)
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-AC_SUBST([INSTALL_STRIP_PROGRAM])])
-
-# Copyright (C) 2006-2012 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# _AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
-# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
-# This macro is traced by Automake.
-AC_DEFUN([_AM_SUBST_NOTMAKE])
-
-# AM_SUBST_NOTMAKE(VARIABLE)
-# --------------------------
-# Public sister of _AM_SUBST_NOTMAKE.
-AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
-
-# Check how to create a tarball.                            -*- Autoconf -*-
-
-# Copyright (C) 2004-2012 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# _AM_PROG_TAR(FORMAT)
-# --------------------
-# Check how to create a tarball in format FORMAT.
-# FORMAT should be one of 'v7', 'ustar', or 'pax'.
-#
-# Substitute a variable $(am__tar) that is a command
-# writing to stdout a FORMAT-tarball containing the directory
-# $tardir.
-#     tardir=directory && $(am__tar) > result.tar
-#
-# Substitute a variable $(am__untar) that extract such
-# a tarball read from stdin.
-#     $(am__untar) < result.tar
-AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.  Yes, it's still used
-# in the wild :-(  We should find a proper way to deprecate it ...
-AC_SUBST([AMTAR], ['$${TAR-tar}'])
-m4_if([$1], [v7],
-     [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
-     [m4_case([$1], [ustar],, [pax],,
-              [m4_fatal([Unknown tar format])])
-AC_MSG_CHECKING([how to create a $1 tar archive])
-# Loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of '-'.
-for _am_tool in $_am_tools
-do
-  case $_am_tool in
-  gnutar)
-    for _am_tar in tar gnutar gtar;
-    do
-      AM_RUN_LOG([$_am_tar --version]) && break
-    done
-    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-    am__untar="$_am_tar -xf -"
-    ;;
-  plaintar)
-    # Must skip GNU tar: if it does not support --format= it doesn't create
-    # ustar tarball either.
-    (tar --version) >/dev/null 2>&1 && continue
-    am__tar='tar chf - "$$tardir"'
-    am__tar_='tar chf - "$tardir"'
-    am__untar='tar xf -'
-    ;;
-  pax)
-    am__tar='pax -L -x $1 -w "$$tardir"'
-    am__tar_='pax -L -x $1 -w "$tardir"'
-    am__untar='pax -r'
-    ;;
-  cpio)
-    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-    am__untar='cpio -i -H $1 -d'
-    ;;
-  none)
-    am__tar=false
-    am__tar_=false
-    am__untar=false
-    ;;
-  esac
-
-  # If the value was cached, stop now.  We just wanted to have am__tar
-  # and am__untar set.
-  test -n "${am_cv_prog_tar_$1}" && break
-
-  # tar/untar a dummy directory, and stop if the command works
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  echo GrepMe > conftest.dir/file
-  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
-  rm -rf conftest.dir
-  if test -s conftest.tar; then
-    AM_RUN_LOG([$am__untar <conftest.tar])
-    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-  fi
-done
-rm -rf conftest.dir
-
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-AC_SUBST([am__tar])
-AC_SUBST([am__untar])
-]) # _AM_PROG_TAR
-

+ 0 - 213
db/autoscan.log

@@ -1,213 +0,0 @@
-autoscan: warning: missing AC_CHECK_FUNCS([memset]) wanted by: 
-	db_api/mysqltest01.cpp:108
-	db_api/mysqltest01.cpp:124
-	db_api/mysqltest01.cpp:152
-	db_api/mysqltest01.cpp:182
-	db_api/mysqltest01.cpp:215
-	db_api/mysqltest01.cpp:254
-	db_api/mysqltest01.cpp:258
-	db_api/mysqltest01.cpp:448
-	db_api/CDBResultSet.cpp:217
-autoscan: warning: missing AC_CHECK_HEADERS([string.h]) wanted by: 
-	db_api/mysqltest01.cpp:10
-	db_api/CDBResultSet.cpp:2
-	db_api/CDBConnect.cpp:2
-	db_api/CDBHelper.cpp:3
-autoscan: warning: missing AC_CHECK_HEADER_STDBOOL wanted by: 
-	db_api/CjasonCommon.h:110
-	db_api/CjasonCommon.h:144
-	db_api/mysqltest01.cpp:365
-	db_api/CDBResultSet.cpp:37
-	db_api/CDBResultSet.cpp:72
-	db_api/CDBResultSet.cpp:85
-	db_api/CDBResultSet.cpp:117
-	db_api/CDBResultSet.cpp:117
-	db_api/CDBResultSet.cpp:142
-	db_api/CDBResultSet.cpp:146
-	db_api/CDBResultSet.cpp:160
-	db_api/CDBResultSet.cpp:164
-	db_api/CDBResultSet.cpp:178
-	db_api/CDBResultSet.cpp:182
-	db_api/CDBResultSet.cpp:196
-	db_api/CDBResultSet.cpp:201
-	db_api/CDBResultSet.cpp:215
-	db_api/CDBResultSet.cpp:220
-	db_api/CDBResultSet.cpp:234
-	db_api/CDBResultSet.cpp:234
-	db_api/CDBResultSet.cpp:238
-	db_api/CDBResultSet.cpp:252
-	db_api/CDBResultSet.cpp:256
-	db_api/CDBResultSet.cpp:270
-	db_api/CDBResultSet.cpp:274
-	db_api/CDBResultSet.cpp:288
-	db_api/CDBResultSet.cpp:292
-	db_api/CDBResultSet.cpp:321
-	db_api/CDBResultSet.cpp:333
-	db_api/CDBResultSet.cpp:345
-	db_api/CDBResultSet.cpp:357
-	db_api/CDBResultSet.cpp:369
-	db_api/CDBResultSet.cpp:381
-	db_api/CDBResultSet.cpp:381
-	db_api/CDBResultSet.cpp:393
-	db_api/CDBResultSet.cpp:405
-	db_api/CDBResultSet.cpp:417
-	db_api/CDBConnPool.h:47
-	db_api/CDBConnPool.h:48
-	db_api/CDBConnPool.h:69
-	db_api/CDBConnPool.h:173
-	db_api/CDBConnPool.h:174
-	db_api/CDBConnPool.h:174
-	db_api/CDBConnPool.h:242
-	db_api/CDBConnPool.h:262
-	db_api/CDBConnect.cpp:6
-	db_api/CDBConnect.cpp:19
-	db_api/CDBConnect.cpp:91
-	db_api/CDBConnect.cpp:227
-	db_api/CDBConnect.cpp:232
-	db_api/CDBConnect.cpp:255
-	db_api/CDBResultSet.h:77
-	db_api/CDBResultSet.h:77
-	db_api/CDBResultSet.h:99
-	db_api/CDBResultSet.h:134
-	db_api/CDBResultSet.h:152
-	db_api/CDBResultSet.h:190
-	db_api/CDBResultSet.h:210
-	db_api/CDBResultSet.h:230
-	db_api/CDBResultSet.h:250
-	db_api/CDBResultSet.h:271
-	db_api/CDBResultSet.h:291
-	db_api/CDBResultSet.h:291
-	db_api/CDBResultSet.h:311
-	db_api/CDBResultSet.h:331
-	db_api/CDBResultSet.h:351
-	db_api/CDBResultSet.h:390
-	db_api/CDBResultSet.h:410
-	db_api/CDBResultSet.h:430
-	db_api/CDBResultSet.h:450
-	db_api/CDBResultSet.h:471
-	db_api/CDBResultSet.h:491
-	db_api/CDBResultSet.h:491
-	db_api/CDBResultSet.h:511
-	db_api/CDBResultSet.h:531
-	db_api/CDBResultSet.h:551
-	db_api/CDBConnPool.cpp:18
-	db_api/CDBConnPool.cpp:46
-	db_api/CDBConnPool.cpp:51
-	db_api/CDBConnPool.cpp:51
-	db_api/CDBConnPool.cpp:317
-	db_api/CDBConnPool.cpp:329
-	db_api/CDBConnect.h:37
-	db_api/CDBConnect.h:40
-	db_api/CDBConnect.h:60
-	db_api/CDBConnect.h:113
-	db_api/CDBConnect.h:275
-	db_api/CDBConnect.h:294
-	db_api/CDBConnect.h:314
-	db_api/CjasonCommon.h:118
-	db_api/CjasonCommon.h:153
-	db_api/mysqltest01.cpp:230
-	db_api/mysqltest01.cpp:230
-	db_api/mysqltest01.cpp:365
-	db_api/CDBResultSet.cpp:50
-	db_api/CDBResultSet.cpp:77
-	db_api/CDBResultSet.cpp:90
-	db_api/CDBResultSet.cpp:100
-	db_api/CDBResultSet.cpp:119
-	db_api/CDBResultSet.cpp:124
-	db_api/CDBResultSet.cpp:130
-	db_api/CDBResultSet.cpp:146
-	db_api/CDBResultSet.cpp:149
-	db_api/CDBResultSet.cpp:164
-	db_api/CDBResultSet.cpp:167
-	db_api/CDBResultSet.cpp:182
-	db_api/CDBResultSet.cpp:185
-	db_api/CDBResultSet.cpp:201
-	db_api/CDBResultSet.cpp:204
-	db_api/CDBResultSet.cpp:220
-	db_api/CDBResultSet.cpp:223
-	db_api/CDBResultSet.cpp:236
-	db_api/CDBResultSet.cpp:238
-	db_api/CDBResultSet.cpp:241
-	db_api/CDBResultSet.cpp:256
-	db_api/CDBResultSet.cpp:259
-	db_api/CDBResultSet.cpp:274
-	db_api/CDBResultSet.cpp:277
-	db_api/CDBResultSet.cpp:292
-	db_api/CDBResultSet.cpp:295
-	db_api/CDBResultSet.cpp:330
-	db_api/CDBResultSet.cpp:342
-	db_api/CDBResultSet.cpp:354
-	db_api/CDBResultSet.cpp:366
-	db_api/CDBResultSet.cpp:378
-	db_api/CDBResultSet.cpp:390
-	db_api/CDBResultSet.cpp:402
-	db_api/CDBResultSet.cpp:414
-	db_api/CDBResultSet.cpp:426
-	db_api/CDBConnPool.h:48
-	db_api/CDBConnPool.h:69
-	db_api/CDBConnect.cpp:30
-	db_api/CDBConnect.cpp:39
-	db_api/CDBConnect.cpp:48
-	db_api/CDBConnect.cpp:249
-	db_api/CDBConnect.cpp:260
-	db_api/CDBConnect.cpp:267
-	db_api/CDBConnect.cpp:274
-	db_api/CDBHelper.cpp:21
-	db_api/CDBHelper.cpp:41
-	db_api/CDBConnPool.cpp:58
-	db_api/CDBConnPool.cpp:64
-	db_api/CDBConnPool.cpp:73
-	db_api/CDBConnPool.cpp:266
-	db_api/CDBConnPool.cpp:322
-	db_api/CDBConnPool.cpp:334
-	db_api/CDBConnect.h:40
-	db_api/CjasonCommon.h:124
-	db_api/CjasonCommon.h:159
-	db_api/mysqltest01.cpp:246
-	db_api/mysqltest01.cpp:246
-	db_api/CDBResultSet.cpp:55
-	db_api/CDBResultSet.cpp:82
-	db_api/CDBResultSet.cpp:95
-	db_api/CDBResultSet.cpp:103
-	db_api/CDBResultSet.cpp:136
-	db_api/CDBResultSet.cpp:139
-	db_api/CDBResultSet.cpp:157
-	db_api/CDBResultSet.cpp:175
-	db_api/CDBResultSet.cpp:193
-	db_api/CDBResultSet.cpp:212
-	db_api/CDBResultSet.cpp:231
-	db_api/CDBResultSet.cpp:249
-	db_api/CDBResultSet.cpp:267
-	db_api/CDBResultSet.cpp:285
-	db_api/CDBResultSet.cpp:303
-	db_api/CDBConnPool.h:47
-	db_api/CDBConnect.cpp:54
-	db_api/CDBConnect.cpp:252
-	db_api/CDBConnect.cpp:282
-	db_api/CDBConnPool.cpp:48
-	db_api/CDBConnPool.cpp:84
-	db_api/CDBConnPool.cpp:137
-	db_api/CDBConnPool.cpp:255
-autoscan: warning: missing AC_TYPE_INT64_T wanted by: 
-	db_card.cpp:26
-	db_card.cpp:122
-	db_card.h:11
-	db_card.h:12
-autoscan: warning: missing AC_TYPE_UINT32_T wanted by: 
-	db_card.cpp:21
-	db_card.cpp:76
-	db_card.cpp:165
-autoscan: warning: missing AC_TYPE_UINT64_T wanted by: 
-	db_card.cpp:13
-	db_card.cpp:21
-	db_card.cpp:21
-	db_card.cpp:26
-	db_card.cpp:41
-	db_card.cpp:110
-	db_card.cpp:122
-	db_card.cpp:132
-	db_card.cpp:192
-	db_card.h:11
-	db_card.h:12
-	db_api/CDBConnect.cpp:255
-	db_api/CDBConnect.h:314

+ 0 - 28
db/configure.scan

@@ -1,28 +0,0 @@
-#                                               -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
-
-AC_PREREQ([2.69])
-AC_INIT([FULL-PACKAGE-NAME], [VERSION], [BUG-REPORT-ADDRESS])
-AC_CONFIG_SRCDIR([db_card.cpp])
-AC_CONFIG_HEADERS([config.h])
-
-# Checks for programs.
-AC_PROG_CXX
-AC_PROG_CC
-
-# Checks for libraries.
-
-# Checks for header files.
-AC_CHECK_HEADERS([string.h])
-
-# Checks for typedefs, structures, and compiler characteristics.
-AC_CHECK_HEADER_STDBOOL
-AC_TYPE_INT64_T
-AC_TYPE_UINT32_T
-AC_TYPE_UINT64_T
-
-# Checks for library functions.
-AC_CHECK_FUNCS([memset])
-
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT

+ 0 - 27
log.ini

@@ -1,27 +0,0 @@
-
-main.fname=yals.log
-main.time_align=h	#m:分钟,h:小时,d:天
-main.min_size=1		#1M
-main.level=info	    #error,info,warn,debug
-main.queue_size=8192
-main.show_thread=0
-main.show_srcline=0
-main.show_level=1
-
-log1.fname=los.log
-log1.time_align=d	#m:分钟,h:小时,d:天
-log1.min_size=100		#1M
-log1.level=debug
-log1.show_thread=0
-log1.show_srcline=0
-log1.show_level=0
-log1.queue_size=8192
-
-log2.fname=
-log2.time_align=d	#m:分钟,h:小时,d:天
-log2.min_size=10		#1M
-log2.level=info
-log2.show_thread=1
-log2.show_srcline=0
-log2.show_level=0
-

+ 0 - 699
websocket/Makefile

@@ -1,699 +0,0 @@
-# Makefile.in generated by automake 1.12.3 from Makefile.am.
-# Makefile.  Generated from Makefile.in by configure.
-
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-
-
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
-pkgdatadir = $(datadir)/libwebsocket-a
-pkgincludedir = $(includedir)/libwebsocket-a
-pkglibdir = $(libdir)/libwebsocket-a
-pkglibexecdir = $(libexecdir)/libwebsocket-a
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-subdir = .
-DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(top_srcdir)/../depcomp \
-	$(top_srcdir)/../install-sh $(top_srcdir)/../missing \
-	$(top_srcdir)/configure
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno config.status.lineno
-mkinstalldirs = $(install_sh) -d
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-AR = ar
-ARFLAGS = cru
-libwebsocket_a_AR = $(AR) $(ARFLAGS)
-libwebsocket_a_LIBADD =
-am_libwebsocket_a_OBJECTS = jsonBuilder.$(OBJEXT) wsClient.$(OBJEXT) \
-	wsClientMgr.$(OBJEXT) wsTimerThread.$(OBJEXT) \
-	sio_client.$(OBJEXT) sio_socket.$(OBJEXT) \
-	sio_client_impl.$(OBJEXT) sio_packet.$(OBJEXT)
-libwebsocket_a_OBJECTS = $(am_libwebsocket_a_OBJECTS)
-DEFAULT_INCLUDES = -I.
-depcomp = $(SHELL) $(top_srcdir)/../depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLD = $(CXX)
-CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
-	-o $@
-SOURCES = $(libwebsocket_a_SOURCES)
-DIST_SOURCES = $(libwebsocket_a_SOURCES)
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-ETAGS = etags
-CTAGS = ctags
-CSCOPE = cscope
-AM_RECURSIVE_TARGETS = cscope
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-am__remove_distdir = \
-  if test -d "$(distdir)"; then \
-    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
-      && rm -rf "$(distdir)" \
-      || { sleep 5 && rm -rf "$(distdir)"; }; \
-  else :; fi
-am__post_remove_distdir = $(am__remove_distdir)
-DIST_ARCHIVES = $(distdir).tar.gz
-GZIP_ENV = --best
-DIST_TARGETS = dist-gzip
-distuninstallcheck_listfiles = find . -type f -print
-am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
-  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
-distcleancheck_listfiles = find . -type f -print
-ACLOCAL = ${SHELL} /home/lemon/resource/ya-serv/missing --run aclocal-1.12
-AMTAR = $${TAR-tar}
-AUTOCONF = ${SHELL} /home/lemon/resource/ya-serv/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/lemon/resource/ya-serv/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/lemon/resource/ya-serv/missing --run automake-1.12
-AWK = gawk
-CC = gcc
-CCDEPMODE = depmode=gcc3
-CFLAGS = -g -O2
-CPPFLAGS = 
-CXX = g++
-CXXDEPMODE = depmode=gcc3
-CXXFLAGS = -g
-CYGPATH_W = echo
-DEFS = 
-DEPDIR = .deps
-ECHO_C = 
-ECHO_N = -n
-ECHO_T = 
-EXEEXT = 
-INSTALL = /usr/bin/install -c
-INSTALL_DATA = ${INSTALL} -m 644
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_SCRIPT = ${INSTALL}
-INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
-LDFLAGS = 
-LIBOBJS = 
-LIBS = 
-LTLIBOBJS = 
-MAKEINFO = ${SHELL} /home/lemon/resource/ya-serv/missing --run makeinfo
-MKDIR_P = /bin/mkdir -p
-OBJEXT = o
-PACKAGE = libwebsocket-a
-PACKAGE_BUGREPORT = BUG-REPORT-ADDRESS
-PACKAGE_NAME = libwebsocket.a
-PACKAGE_STRING = libwebsocket.a 1.0
-PACKAGE_TARNAME = libwebsocket-a
-PACKAGE_URL = 
-PACKAGE_VERSION = 1.0
-PATH_SEPARATOR = :
-RANLIB = ranlib
-SET_MAKE = 
-SHELL = /bin/sh
-STRIP = 
-VERSION = 1.0
-abs_builddir = /home/lemon/resource/ya-serv/websocket
-abs_srcdir = /home/lemon/resource/ya-serv/websocket
-abs_top_builddir = /home/lemon/resource/ya-serv/websocket
-abs_top_srcdir = /home/lemon/resource/ya-serv/websocket
-ac_ct_CC = gcc
-ac_ct_CXX = g++
-am__include = include
-am__leading_dot = .
-am__quote = 
-am__tar = $${TAR-tar} chof - "$$tardir"
-am__untar = $${TAR-tar} xf -
-bindir = ${exec_prefix}/bin
-build_alias = 
-builddir = .
-datadir = ${datarootdir}
-datarootdir = ${prefix}/share
-docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
-dvidir = ${docdir}
-exec_prefix = ${prefix}
-host_alias = 
-htmldir = ${docdir}
-includedir = ${prefix}/include
-infodir = ${datarootdir}/info
-install_sh = ${SHELL} /home/lemon/resource/ya-serv/install-sh
-libdir = ${exec_prefix}/lib
-libexecdir = ${exec_prefix}/libexec
-localedir = ${datarootdir}/locale
-localstatedir = ${prefix}/var
-mandir = ${datarootdir}/man
-mkdir_p = $(MKDIR_P)
-oldincludedir = /usr/include
-pdfdir = ${docdir}
-prefix = /home/lemon/resource/ya-serv/websocket/../../dist
-program_transform_name = s,x,x,
-psdir = ${docdir}
-sbindir = ${exec_prefix}/sbin
-sharedstatedir = ${prefix}/com
-srcdir = .
-sysconfdir = ${prefix}/etc
-target_alias = 
-top_build_prefix = 
-top_builddir = .
-top_srcdir = .
-AUTOMAKE_OPTIONS = foreign
-noinst_LIBRARIES = libwebsocket.a
-AM_CPPFLAGS = -Wall -pthread -m64 -std=c++11  -I${prefix}/include -I. -I.. -I./sio
-AM_LDFLAGS = -Wall -pthread -m64 -std=c++11  -L${prefix}/lib  
-libwebsocket_a_SOURCES = jsonBuilder.cpp wsClient.cpp wsClientMgr.cpp wsTimerThread.cpp \
-					 sio/sio_client.cpp sio/sio_socket.cpp  \
-					 sio/internal/sio_client_impl.cpp sio/internal/sio_packet.cpp
-
-EXTRA_DIST = 
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .cpp .o .obj
-am--refresh: Makefile
-	@:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
-	      $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    echo ' $(SHELL) ./config.status'; \
-	    $(SHELL) ./config.status;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	$(am__cd) $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-$(am__aclocal_m4_deps):
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-libwebsocket.a: $(libwebsocket_a_OBJECTS) $(libwebsocket_a_DEPENDENCIES) $(EXTRA_libwebsocket_a_DEPENDENCIES) 
-	-rm -f libwebsocket.a
-	$(libwebsocket_a_AR) libwebsocket.a $(libwebsocket_a_OBJECTS) $(libwebsocket_a_LIBADD)
-	$(RANLIB) libwebsocket.a
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-include ./$(DEPDIR)/jsonBuilder.Po
-include ./$(DEPDIR)/sio_client.Po
-include ./$(DEPDIR)/sio_client_impl.Po
-include ./$(DEPDIR)/sio_packet.Po
-include ./$(DEPDIR)/sio_socket.Po
-include ./$(DEPDIR)/wsClient.Po
-include ./$(DEPDIR)/wsClientMgr.Po
-include ./$(DEPDIR)/wsTimerThread.Po
-
-.cpp.o:
-	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-#	source='$<' object='$@' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXXCOMPILE) -c -o $@ $<
-
-.cpp.obj:
-	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-#	source='$<' object='$@' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-sio_client.o: sio/sio_client.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sio_client.o -MD -MP -MF $(DEPDIR)/sio_client.Tpo -c -o sio_client.o `test -f 'sio/sio_client.cpp' || echo '$(srcdir)/'`sio/sio_client.cpp
-	$(am__mv) $(DEPDIR)/sio_client.Tpo $(DEPDIR)/sio_client.Po
-#	source='sio/sio_client.cpp' object='sio_client.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sio_client.o `test -f 'sio/sio_client.cpp' || echo '$(srcdir)/'`sio/sio_client.cpp
-
-sio_client.obj: sio/sio_client.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sio_client.obj -MD -MP -MF $(DEPDIR)/sio_client.Tpo -c -o sio_client.obj `if test -f 'sio/sio_client.cpp'; then $(CYGPATH_W) 'sio/sio_client.cpp'; else $(CYGPATH_W) '$(srcdir)/sio/sio_client.cpp'; fi`
-	$(am__mv) $(DEPDIR)/sio_client.Tpo $(DEPDIR)/sio_client.Po
-#	source='sio/sio_client.cpp' object='sio_client.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sio_client.obj `if test -f 'sio/sio_client.cpp'; then $(CYGPATH_W) 'sio/sio_client.cpp'; else $(CYGPATH_W) '$(srcdir)/sio/sio_client.cpp'; fi`
-
-sio_socket.o: sio/sio_socket.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sio_socket.o -MD -MP -MF $(DEPDIR)/sio_socket.Tpo -c -o sio_socket.o `test -f 'sio/sio_socket.cpp' || echo '$(srcdir)/'`sio/sio_socket.cpp
-	$(am__mv) $(DEPDIR)/sio_socket.Tpo $(DEPDIR)/sio_socket.Po
-#	source='sio/sio_socket.cpp' object='sio_socket.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sio_socket.o `test -f 'sio/sio_socket.cpp' || echo '$(srcdir)/'`sio/sio_socket.cpp
-
-sio_socket.obj: sio/sio_socket.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sio_socket.obj -MD -MP -MF $(DEPDIR)/sio_socket.Tpo -c -o sio_socket.obj `if test -f 'sio/sio_socket.cpp'; then $(CYGPATH_W) 'sio/sio_socket.cpp'; else $(CYGPATH_W) '$(srcdir)/sio/sio_socket.cpp'; fi`
-	$(am__mv) $(DEPDIR)/sio_socket.Tpo $(DEPDIR)/sio_socket.Po
-#	source='sio/sio_socket.cpp' object='sio_socket.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sio_socket.obj `if test -f 'sio/sio_socket.cpp'; then $(CYGPATH_W) 'sio/sio_socket.cpp'; else $(CYGPATH_W) '$(srcdir)/sio/sio_socket.cpp'; fi`
-
-sio_client_impl.o: sio/internal/sio_client_impl.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sio_client_impl.o -MD -MP -MF $(DEPDIR)/sio_client_impl.Tpo -c -o sio_client_impl.o `test -f 'sio/internal/sio_client_impl.cpp' || echo '$(srcdir)/'`sio/internal/sio_client_impl.cpp
-	$(am__mv) $(DEPDIR)/sio_client_impl.Tpo $(DEPDIR)/sio_client_impl.Po
-#	source='sio/internal/sio_client_impl.cpp' object='sio_client_impl.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sio_client_impl.o `test -f 'sio/internal/sio_client_impl.cpp' || echo '$(srcdir)/'`sio/internal/sio_client_impl.cpp
-
-sio_client_impl.obj: sio/internal/sio_client_impl.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sio_client_impl.obj -MD -MP -MF $(DEPDIR)/sio_client_impl.Tpo -c -o sio_client_impl.obj `if test -f 'sio/internal/sio_client_impl.cpp'; then $(CYGPATH_W) 'sio/internal/sio_client_impl.cpp'; else $(CYGPATH_W) '$(srcdir)/sio/internal/sio_client_impl.cpp'; fi`
-	$(am__mv) $(DEPDIR)/sio_client_impl.Tpo $(DEPDIR)/sio_client_impl.Po
-#	source='sio/internal/sio_client_impl.cpp' object='sio_client_impl.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sio_client_impl.obj `if test -f 'sio/internal/sio_client_impl.cpp'; then $(CYGPATH_W) 'sio/internal/sio_client_impl.cpp'; else $(CYGPATH_W) '$(srcdir)/sio/internal/sio_client_impl.cpp'; fi`
-
-sio_packet.o: sio/internal/sio_packet.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sio_packet.o -MD -MP -MF $(DEPDIR)/sio_packet.Tpo -c -o sio_packet.o `test -f 'sio/internal/sio_packet.cpp' || echo '$(srcdir)/'`sio/internal/sio_packet.cpp
-	$(am__mv) $(DEPDIR)/sio_packet.Tpo $(DEPDIR)/sio_packet.Po
-#	source='sio/internal/sio_packet.cpp' object='sio_packet.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sio_packet.o `test -f 'sio/internal/sio_packet.cpp' || echo '$(srcdir)/'`sio/internal/sio_packet.cpp
-
-sio_packet.obj: sio/internal/sio_packet.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sio_packet.obj -MD -MP -MF $(DEPDIR)/sio_packet.Tpo -c -o sio_packet.obj `if test -f 'sio/internal/sio_packet.cpp'; then $(CYGPATH_W) 'sio/internal/sio_packet.cpp'; else $(CYGPATH_W) '$(srcdir)/sio/internal/sio_packet.cpp'; fi`
-	$(am__mv) $(DEPDIR)/sio_packet.Tpo $(DEPDIR)/sio_packet.Po
-#	source='sio/internal/sio_packet.cpp' object='sio_packet.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sio_packet.obj `if test -f 'sio/internal/sio_packet.cpp'; then $(CYGPATH_W) 'sio/internal/sio_packet.cpp'; else $(CYGPATH_W) '$(srcdir)/sio/internal/sio_packet.cpp'; fi`
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-cscope: cscope.files
-	test ! -s cscope.files \
-	  || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
-
-clean-cscope:
-	-rm -f cscope.files
-
-cscope.files: clean-cscope  cscopelist
-
-cscopelist:  $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS) $(LISP)'; \
-	case "$(srcdir)" in \
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
-
-distdir: $(DISTFILES)
-	$(am__remove_distdir)
-	test -d "$(distdir)" || mkdir "$(distdir)"
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-	-test -n "$(am__skip_mode_fix)" \
-	|| find "$(distdir)" -type d ! -perm -755 \
-		-exec chmod u+rwx,go+rx {} \; -o \
-	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
-	|| chmod -R a+r "$(distdir)"
-dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__post_remove_distdir)
-
-dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
-	$(am__post_remove_distdir)
-
-dist-lzip: distdir
-	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
-	$(am__post_remove_distdir)
-
-dist-xz: distdir
-	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
-	$(am__post_remove_distdir)
-
-dist-tarZ: distdir
-	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__post_remove_distdir)
-
-dist-shar: distdir
-	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	$(am__post_remove_distdir)
-
-dist-zip: distdir
-	-rm -f $(distdir).zip
-	zip -rq $(distdir).zip $(distdir)
-	$(am__post_remove_distdir)
-
-dist dist-all:
-	$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
-	$(am__post_remove_distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	case '$(DIST_ARCHIVES)' in \
-	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
-	*.tar.bz2*) \
-	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
-	*.tar.lz*) \
-	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
-	*.tar.xz*) \
-	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
-	*.tar.Z*) \
-	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
-	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
-	*.zip*) \
-	  unzip $(distdir).zip ;;\
-	esac
-	chmod -R a-w $(distdir)
-	chmod u+w $(distdir)
-	mkdir $(distdir)/_build $(distdir)/_inst
-	chmod a-w $(distdir)
-	test -d $(distdir)/_build || exit 0; \
-	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
-	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-	  && am__cwd=`pwd` \
-	  && $(am__cd) $(distdir)/_build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
-	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
-	    $(DISTCHECK_CONFIGURE_FLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
-	        distuninstallcheck \
-	  && chmod -R a-w "$$dc_install_base" \
-	  && ({ \
-	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
-	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
-	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
-	  && rm -rf "$$dc_destdir" \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist \
-	  && rm -rf $(DIST_ARCHIVES) \
-	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
-	  && cd "$$am__cwd" \
-	  || exit 1
-	$(am__post_remove_distdir)
-	@(echo "$(distdir) archives ready for distribution: "; \
-	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
-distuninstallcheck:
-	@test -n '$(distuninstallcheck_dir)' || { \
-	  echo 'ERROR: trying to run $@ with an empty' \
-	       '$$(distuninstallcheck_dir)' >&2; \
-	  exit 1; \
-	}; \
-	$(am__cd) '$(distuninstallcheck_dir)' || { \
-	  echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
-	  exit 1; \
-	}; \
-	test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
-	   || { echo "ERROR: files left after uninstall:" ; \
-	        if test -n "$(DESTDIR)"; then \
-	          echo "  (check DESTDIR support)"; \
-	        fi ; \
-	        $(distuninstallcheck_listfiles) ; \
-	        exit 1; } >&2
-distcleancheck: distclean
-	@if test '$(srcdir)' = . ; then \
-	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
-	  exit 1 ; \
-	fi
-	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
-	  || { echo "ERROR: files left in build directory after distclean:" ; \
-	       $(distcleancheck_listfiles) ; \
-	       exit 1; } >&2
-check-am: all-am
-check: check-am
-all-am: Makefile $(LIBRARIES)
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
-
-distclean: distclean-am
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
-	clean-cscope clean-generic clean-noinstLIBRARIES cscope \
-	cscopelist ctags dist dist-all dist-bzip2 dist-gzip dist-lzip \
-	dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \
-	distclean-compile distclean-generic distclean-tags \
-	distcleancheck distdir distuninstallcheck dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 5126
websocket/autom4te.cache/output.0


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 5126
websocket/autom4te.cache/output.1


+ 0 - 830
websocket/autom4te.cache/traces.0

@@ -1,830 +0,0 @@
-m4trace:/usr/share/aclocal-1.12/amversion.m4:14: -1- AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.12'
-dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
-dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.12.3], [],
-      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
-])
-m4trace:/usr/share/aclocal-1.12/amversion.m4:33: -1- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], [AM_AUTOMAKE_VERSION([1.12.3])dnl
-m4_ifndef([AC_AUTOCONF_VERSION],
-  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
-m4trace:/usr/share/aclocal-1.12/auxdir.m4:47: -1- AC_DEFUN([AM_AUX_DIR_EXPAND], [dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-])
-m4trace:/usr/share/aclocal-1.12/cond.m4:12: -1- AC_DEFUN([AM_CONDITIONAL], [AC_PREREQ([2.52])dnl
- m4_if([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-       [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])dnl
-AC_SUBST([$1_FALSE])dnl
-_AM_SUBST_NOTMAKE([$1_TRUE])dnl
-_AM_SUBST_NOTMAKE([$1_FALSE])dnl
-m4_define([_AM_COND_VALUE_$1], [$2])dnl
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi
-AC_CONFIG_COMMANDS_PRE(
-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-  AC_MSG_ERROR([[conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.]])
-fi])])
-m4trace:/usr/share/aclocal-1.12/depend.m4:26: -1- AC_DEFUN([_AM_DEPENDENCIES], [AC_REQUIRE([AM_SET_DEPDIR])dnl
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-AC_REQUIRE([AM_DEP_TRACK])dnl
-
-m4_if([$1], [CC],   [depcc="$CC"   am_compiler_list=],
-      [$1], [CXX],  [depcc="$CXX"  am_compiler_list=],
-      [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-      [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
-      [$1], [UPC],  [depcc="$UPC"  am_compiler_list=],
-      [$1], [GCJ],  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                    [depcc="$$1"   am_compiler_list=])
-
-AC_CACHE_CHECK([dependency style of $depcc],
-               [am_cv_$1_dependencies_compiler_type],
-[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_$1_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
-  m4_case([$1], [CC],
-    [case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac],
-    [CXX],
-    [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_$1_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_$1_dependencies_compiler_type=none
-fi
-])
-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-AM_CONDITIONAL([am__fastdep$1], [
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-])
-m4trace:/usr/share/aclocal-1.12/depend.m4:163: -1- AC_DEFUN([AM_SET_DEPDIR], [AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-])
-m4trace:/usr/share/aclocal-1.12/depend.m4:171: -1- AC_DEFUN([AM_DEP_TRACK], [AC_ARG_ENABLE([dependency-tracking], [dnl
-AS_HELP_STRING(
-  [--enable-dependency-tracking],
-  [do not reject slow dependency extractors])
-AS_HELP_STRING(
-  [--disable-dependency-tracking],
-  [speeds up one-time build])])
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-  am__nodep='_no'
-fi
-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])dnl
-_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
-AC_SUBST([am__nodep])dnl
-_AM_SUBST_NOTMAKE([am__nodep])dnl
-])
-m4trace:/usr/share/aclocal-1.12/depout.m4:12: -1- AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], [{
-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
-  # are listed without --file.  Let's play safe and only enable the eval
-  # if we detect the quoting.
-  case $CONFIG_FILES in
-  *\'*) eval set x "$CONFIG_FILES" ;;
-  *)   set x $CONFIG_FILES ;;
-  esac
-  shift
-  for mf
-  do
-    # Strip MF so we end up with the name of the file.
-    mf=`echo "$mf" | sed -e 's/:.*$//'`
-    # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named 'Makefile.in', but
-    # some people rename them; so instead we look at the file content.
-    # Grep'ing the first line is not enough: some people post-process
-    # each Makefile.in and add a new line on top of each file to say so.
-    # Grep'ing the whole file is not good either: AIX grep has a line
-    # limit of 2048, but all sed's we know have understand at least 4000.
-    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-      dirpart=`AS_DIRNAME("$mf")`
-    else
-      continue
-    fi
-    # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running 'make'.
-    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-    test -z "$DEPDIR" && continue
-    am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "am__include" && continue
-    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # Find all dependency output files, they are included files with
-    # $(DEPDIR) in their names.  We invoke sed twice because it is the
-    # simplest approach to changing $(DEPDIR) to its actual value in the
-    # expansion.
-    for file in `sed -n "
-      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
-      # Make sure the directory exists.
-      test -f "$dirpart/$file" && continue
-      fdir=`AS_DIRNAME(["$file"])`
-      AS_MKDIR_P([$dirpart/$fdir])
-      # echo "creating $dirpart/$file"
-      echo '# dummy' > "$dirpart/$file"
-    done
-  done
-}
-])
-m4trace:/usr/share/aclocal-1.12/depout.m4:71: -1- AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles],
-     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
-m4trace:/usr/share/aclocal-1.12/init.m4:23: -1- AC_DEFUN([AM_INIT_AUTOMAKE], [AC_PREREQ([2.62])dnl
-dnl Autoconf wants to disallow AM_ names.  We explicitly allow
-dnl the ones we care about.
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])dnl
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
-  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-  # is not polluted with repeated "-I."
-  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
-  # test to see if srcdir already configured
-  if test -f $srcdir/config.status; then
-    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-  fi
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-AC_SUBST([CYGPATH_W])
-
-# Define the identity of the package.
-dnl Distinguish between old-style and new-style calls.
-m4_ifval([$2],
-[AC_DIAGNOSE([obsolete],
-[$0: two- and three-arguments forms are deprecated.  For more info, see:
-http://www.gnu.org/software/automake/manual/automake.html#Modernize-AM_INIT_AUTOMAKE-invocation])
-m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
- AC_SUBST([PACKAGE], [$1])dnl
- AC_SUBST([VERSION], [$2])],
-[_AM_SET_OPTIONS([$1])dnl
-dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(
-  m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
-  [ok:ok],,
-  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-
-_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
- AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
-
-# Some tools Automake needs.
-AC_REQUIRE([AM_SANITY_CHECK])dnl
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
-AM_MISSING_PROG([AUTOCONF], [autoconf])
-AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
-AM_MISSING_PROG([AUTOHEADER], [autoheader])
-AM_MISSING_PROG([MAKEINFO], [makeinfo])
-AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-# For better backward compatibility.  To be removed once Automake 1.9.x
-# dies out for good.  For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
-AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
-	      [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-			     [_AM_PROG_TAR([v7])])])
-_AM_IF_OPTION([no-dependencies],,
-[AC_PROVIDE_IFELSE([AC_PROG_CC],
-		  [_AM_DEPENDENCIES([CC])],
-		  [m4_define([AC_PROG_CC],
-			     m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_CXX],
-		  [_AM_DEPENDENCIES([CXX])],
-		  [m4_define([AC_PROG_CXX],
-			     m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-		  [_AM_DEPENDENCIES([OBJC])],
-		  [m4_define([AC_PROG_OBJC],
-			     m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
-dnl Support for Objective C++ was only introduced in Autoconf 2.65,
-dnl but we still cater to Autoconf 2.62.
-m4_ifdef([AC_PROG_OBJCXX],
-[AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
-		  [_AM_DEPENDENCIES([OBJCXX])],
-		  [m4_define([AC_PROG_OBJCXX],
-			     m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])])dnl
-])
-_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
-dnl The 'parallel-tests' driver may need to know about EXEEXT, so add the
-dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
-dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
-AC_CONFIG_COMMANDS_PRE(dnl
-[m4_provide_if([_AM_COMPILER_EXEEXT],
-  [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
-])
-m4trace:/usr/share/aclocal-1.12/init.m4:140: -1- AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], [# Compute $1's index in $config_headers.
-_am_arg=$1
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $_am_arg | $_am_arg:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-m4trace:/usr/share/aclocal-1.12/install-sh.m4:11: -1- AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-if test x"${install_sh}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
-  *)
-    install_sh="\${SHELL} $am_aux_dir/install-sh"
-  esac
-fi
-AC_SUBST([install_sh])])
-m4trace:/usr/share/aclocal-1.12/lead-dot.m4:10: -1- AC_DEFUN([AM_SET_LEADING_DOT], [rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
-m4trace:/usr/share/aclocal-1.12/make.m4:12: -1- AC_DEFUN([AM_MAKE_INCLUDE], [am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo this is the am__doit target
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from 'make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
-  am__include=include
-  am__quote=
-  _am_result=GNU
-  ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   case `$am_make -s -f confmf 2> /dev/null` in #(
-   *the\ am__doit\ target*)
-     am__include=.include
-     am__quote="\""
-     _am_result=BSD
-     ;;
-   esac
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
-m4trace:/usr/share/aclocal-1.12/missing.m4:11: -1- AC_DEFUN([AM_MISSING_PROG], [AC_REQUIRE([AM_MISSING_HAS_RUN])
-$1=${$1-"${am_missing_run}$2"}
-AC_SUBST($1)])
-m4trace:/usr/share/aclocal-1.12/missing.m4:20: -1- AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([missing])dnl
-if test x"${MISSING+set}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-  *)
-    MISSING="\${SHELL} $am_aux_dir/missing" ;;
-  esac
-fi
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  AC_MSG_WARN(['missing' script is too old or missing])
-fi
-])
-m4trace:/usr/share/aclocal-1.12/options.m4:11: -1- AC_DEFUN([_AM_MANGLE_OPTION], [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-m4trace:/usr/share/aclocal-1.12/options.m4:17: -1- AC_DEFUN([_AM_SET_OPTION], [m4_define(_AM_MANGLE_OPTION([$1]), [1])])
-m4trace:/usr/share/aclocal-1.12/options.m4:23: -1- AC_DEFUN([_AM_SET_OPTIONS], [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-m4trace:/usr/share/aclocal-1.12/options.m4:29: -1- AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-m4trace:/usr/share/aclocal-1.12/runlog.m4:12: -1- AC_DEFUN([AM_RUN_LOG], [{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
-   ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   (exit $ac_status); }])
-m4trace:/usr/share/aclocal-1.12/sanity.m4:11: -1- AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane])
-# Reject unsafe characters in $srcdir or the absolute working directory
-# name.  Accept space and tab only in the latter.
-am_lf='
-'
-case `pwd` in
-  *[[\\\"\#\$\&\'\`$am_lf]]*)
-    AC_MSG_ERROR([unsafe absolute working directory name]);;
-esac
-case $srcdir in
-  *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
-    AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
-esac
-
-# Do 'set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   am_has_slept=no
-   for am_try in 1 2; do
-     echo "timestamp, slept: $am_has_slept" > conftest.file
-     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-     if test "$[*]" = "X"; then
-	# -L didn't work.
-	set X `ls -t "$srcdir/configure" conftest.file`
-     fi
-     if test "$[*]" != "X $srcdir/configure conftest.file" \
-	&& test "$[*]" != "X conftest.file $srcdir/configure"; then
-
-	# If neither matched, then we have a broken ls.  This can happen
-	# if, for instance, CONFIG_SHELL is bash and it inherits a
-	# broken ls alias from the environment.  This has actually
-	# happened.  Such a system could not be considered "sane".
-	AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-  alias in your environment])
-     fi
-     if test "$[2]" = conftest.file || test $am_try -eq 2; then
-       break
-     fi
-     # Just in case.
-     sleep 1
-     am_has_slept=yes
-   done
-   test "$[2]" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-AC_MSG_RESULT([yes])
-# If we didn't sleep, we still need to ensure time stamps of config.status and
-# generated files are strictly newer.
-am_sleep_pid=
-if grep 'slept: no' conftest.file >/dev/null 2>&1; then
-  ( sleep 1 ) &
-  am_sleep_pid=$!
-fi
-AC_CONFIG_COMMANDS_PRE(
-  [AC_MSG_CHECKING([that generated files are newer than configure])
-   if test -n "$am_sleep_pid"; then
-     # Hide warnings about reused PIDs.
-     wait $am_sleep_pid 2>/dev/null
-   fi
-   AC_MSG_RESULT([done])])
-rm -f conftest.file
-])
-m4trace:/usr/share/aclocal-1.12/silent.m4:12: -1- AC_DEFUN([AM_SILENT_RULES], [AC_ARG_ENABLE([silent-rules], [dnl
-AS_HELP_STRING(
-  [--enable-silent-rules],
-  [less verbose build output (undo: "make V=1")])
-AS_HELP_STRING(
-  [--disable-silent-rules],
-  [verbose build output (undo: "make V=0")])dnl
-])
-case $enable_silent_rules in @%:@ (((
-  yes) AM_DEFAULT_VERBOSITY=0;;
-   no) AM_DEFAULT_VERBOSITY=1;;
-    *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
-esac
-dnl
-dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
-dnl do not support nested variable expansions.
-dnl See automake bug#9928 and bug#10237.
-am_make=${MAKE-make}
-AC_CACHE_CHECK([whether $am_make supports nested variables],
-   [am_cv_make_support_nested_variables],
-   [if AS_ECHO([['TRUE=$(BAR$(V))
-BAR0=false
-BAR1=true
-V=1
-am__doit:
-	@$(TRUE)
-.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
-  am_cv_make_support_nested_variables=yes
-else
-  am_cv_make_support_nested_variables=no
-fi])
-if test $am_cv_make_support_nested_variables = yes; then
-  dnl Using '$V' instead of '$(V)' breaks IRIX make.
-  AM_V='$(V)'
-  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
-else
-  AM_V=$AM_DEFAULT_VERBOSITY
-  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
-fi
-AC_SUBST([AM_V])dnl
-AM_SUBST_NOTMAKE([AM_V])dnl
-AC_SUBST([AM_DEFAULT_V])dnl
-AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
-AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
-AM_BACKSLASH='\'
-AC_SUBST([AM_BACKSLASH])dnl
-_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
-])
-m4trace:/usr/share/aclocal-1.12/strip.m4:17: -1- AC_DEFUN([AM_PROG_INSTALL_STRIP], [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using 'strip' when the user
-# run "make install-strip".  However 'strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the 'STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
-if test "$cross_compiling" != no; then
-  AC_CHECK_TOOL([STRIP], [strip], :)
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-AC_SUBST([INSTALL_STRIP_PROGRAM])])
-m4trace:/usr/share/aclocal-1.12/substnot.m4:12: -1- AC_DEFUN([_AM_SUBST_NOTMAKE])
-m4trace:/usr/share/aclocal-1.12/substnot.m4:17: -1- AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
-m4trace:/usr/share/aclocal-1.12/tar.m4:22: -1- AC_DEFUN([_AM_PROG_TAR], [# Always define AMTAR for backward compatibility.  Yes, it's still used
-# in the wild :-(  We should find a proper way to deprecate it ...
-AC_SUBST([AMTAR], ['$${TAR-tar}'])
-m4_if([$1], [v7],
-     [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
-     [m4_case([$1], [ustar],, [pax],,
-              [m4_fatal([Unknown tar format])])
-AC_MSG_CHECKING([how to create a $1 tar archive])
-# Loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of '-'.
-for _am_tool in $_am_tools
-do
-  case $_am_tool in
-  gnutar)
-    for _am_tar in tar gnutar gtar;
-    do
-      AM_RUN_LOG([$_am_tar --version]) && break
-    done
-    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-    am__untar="$_am_tar -xf -"
-    ;;
-  plaintar)
-    # Must skip GNU tar: if it does not support --format= it doesn't create
-    # ustar tarball either.
-    (tar --version) >/dev/null 2>&1 && continue
-    am__tar='tar chf - "$$tardir"'
-    am__tar_='tar chf - "$tardir"'
-    am__untar='tar xf -'
-    ;;
-  pax)
-    am__tar='pax -L -x $1 -w "$$tardir"'
-    am__tar_='pax -L -x $1 -w "$tardir"'
-    am__untar='pax -r'
-    ;;
-  cpio)
-    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-    am__untar='cpio -i -H $1 -d'
-    ;;
-  none)
-    am__tar=false
-    am__tar_=false
-    am__untar=false
-    ;;
-  esac
-
-  # If the value was cached, stop now.  We just wanted to have am__tar
-  # and am__untar set.
-  test -n "${am_cv_prog_tar_$1}" && break
-
-  # tar/untar a dummy directory, and stop if the command works
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  echo GrepMe > conftest.dir/file
-  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
-  rm -rf conftest.dir
-  if test -s conftest.tar; then
-    AM_RUN_LOG([$am__untar <conftest.tar])
-    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-  fi
-done
-rm -rf conftest.dir
-
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-AC_SUBST([am__tar])
-AC_SUBST([am__untar])
-])
-m4trace:configure.ac:5: -1- m4_pattern_forbid([^_?A[CHUM]_])
-m4trace:configure.ac:5: -1- m4_pattern_forbid([_AC_])
-m4trace:configure.ac:5: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS'])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^AS_FLAGS$])
-m4trace:configure.ac:5: -1- m4_pattern_forbid([^_?m4_])
-m4trace:configure.ac:5: -1- m4_pattern_forbid([^dnl$])
-m4trace:configure.ac:5: -1- m4_pattern_forbid([^_?AS_])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^SHELL$])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^PATH_SEPARATOR$])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^PACKAGE_NAME$])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^PACKAGE_TARNAME$])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^PACKAGE_VERSION$])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^PACKAGE_STRING$])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^PACKAGE_BUGREPORT$])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^PACKAGE_URL$])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^exec_prefix$])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^prefix$])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^program_transform_name$])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^bindir$])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^sbindir$])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^libexecdir$])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^datarootdir$])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^datadir$])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^sysconfdir$])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^sharedstatedir$])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^localstatedir$])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^includedir$])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^oldincludedir$])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^docdir$])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^infodir$])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^htmldir$])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^dvidir$])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^pdfdir$])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^psdir$])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^libdir$])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^localedir$])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^mandir$])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^PACKAGE_NAME$])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^PACKAGE_TARNAME$])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^PACKAGE_VERSION$])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^PACKAGE_STRING$])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^PACKAGE_BUGREPORT$])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^PACKAGE_URL$])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^DEFS$])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^ECHO_C$])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^ECHO_N$])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^ECHO_T$])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^LIBS$])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^build_alias$])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^host_alias$])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^target_alias$])
-m4trace:configure.ac:8: -1- AM_INIT_AUTOMAKE
-m4trace:configure.ac:8: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$])
-m4trace:configure.ac:8: -1- AM_SET_CURRENT_AUTOMAKE_VERSION
-m4trace:configure.ac:8: -1- AM_AUTOMAKE_VERSION([1.12.3])
-m4trace:configure.ac:8: -1- _AM_AUTOCONF_VERSION([2.69])
-m4trace:configure.ac:8: -1- m4_pattern_allow([^INSTALL_PROGRAM$])
-m4trace:configure.ac:8: -1- m4_pattern_allow([^INSTALL_SCRIPT$])
-m4trace:configure.ac:8: -1- m4_pattern_allow([^INSTALL_DATA$])
-m4trace:configure.ac:8: -1- m4_pattern_allow([^am__isrc$])
-m4trace:configure.ac:8: -1- _AM_SUBST_NOTMAKE([am__isrc])
-m4trace:configure.ac:8: -1- m4_pattern_allow([^CYGPATH_W$])
-m4trace:configure.ac:8: -1- _AM_SET_OPTIONS([])
-m4trace:configure.ac:8: -1- m4_pattern_allow([^PACKAGE$])
-m4trace:configure.ac:8: -1- m4_pattern_allow([^VERSION$])
-m4trace:configure.ac:8: -1- _AM_IF_OPTION([no-define], [], [AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
- AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])
-m4trace:configure.ac:8: -2- _AM_MANGLE_OPTION([no-define])
-m4trace:configure.ac:8: -1- m4_pattern_allow([^PACKAGE$])
-m4trace:configure.ac:8: -1- m4_pattern_allow([^VERSION$])
-m4trace:configure.ac:8: -1- AM_SANITY_CHECK
-m4trace:configure.ac:8: -1- AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
-m4trace:configure.ac:8: -1- AM_MISSING_HAS_RUN
-m4trace:configure.ac:8: -1- AM_AUX_DIR_EXPAND
-m4trace:configure.ac:8: -1- m4_pattern_allow([^ACLOCAL$])
-m4trace:configure.ac:8: -1- AM_MISSING_PROG([AUTOCONF], [autoconf])
-m4trace:configure.ac:8: -1- m4_pattern_allow([^AUTOCONF$])
-m4trace:configure.ac:8: -1- AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
-m4trace:configure.ac:8: -1- m4_pattern_allow([^AUTOMAKE$])
-m4trace:configure.ac:8: -1- AM_MISSING_PROG([AUTOHEADER], [autoheader])
-m4trace:configure.ac:8: -1- m4_pattern_allow([^AUTOHEADER$])
-m4trace:configure.ac:8: -1- AM_MISSING_PROG([MAKEINFO], [makeinfo])
-m4trace:configure.ac:8: -1- m4_pattern_allow([^MAKEINFO$])
-m4trace:configure.ac:8: -1- AM_PROG_INSTALL_SH
-m4trace:configure.ac:8: -1- m4_pattern_allow([^install_sh$])
-m4trace:configure.ac:8: -1- AM_PROG_INSTALL_STRIP
-m4trace:configure.ac:8: -1- m4_pattern_allow([^STRIP$])
-m4trace:configure.ac:8: -1- m4_pattern_allow([^INSTALL_STRIP_PROGRAM$])
-m4trace:configure.ac:8: -1- m4_pattern_allow([^MKDIR_P$])
-m4trace:configure.ac:8: -1- m4_pattern_allow([^mkdir_p$])
-m4trace:configure.ac:8: -1- m4_pattern_allow([^AWK$])
-m4trace:configure.ac:8: -1- m4_pattern_allow([^SET_MAKE$])
-m4trace:configure.ac:8: -1- AM_SET_LEADING_DOT
-m4trace:configure.ac:8: -1- m4_pattern_allow([^am__leading_dot$])
-m4trace:configure.ac:8: -1- _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-			     [_AM_PROG_TAR([v7])])])
-m4trace:configure.ac:8: -2- _AM_MANGLE_OPTION([tar-ustar])
-m4trace:configure.ac:8: -1- _AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], [_AM_PROG_TAR([v7])])
-m4trace:configure.ac:8: -2- _AM_MANGLE_OPTION([tar-pax])
-m4trace:configure.ac:8: -1- _AM_PROG_TAR([v7])
-m4trace:configure.ac:8: -1- m4_pattern_allow([^AMTAR$])
-m4trace:configure.ac:8: -1- m4_pattern_allow([^am__tar$])
-m4trace:configure.ac:8: -1- m4_pattern_allow([^am__untar$])
-m4trace:configure.ac:8: -1- _AM_IF_OPTION([no-dependencies], [], [AC_PROVIDE_IFELSE([AC_PROG_CC],
-		  [_AM_DEPENDENCIES([CC])],
-		  [m4_define([AC_PROG_CC],
-			     m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_CXX],
-		  [_AM_DEPENDENCIES([CXX])],
-		  [m4_define([AC_PROG_CXX],
-			     m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-		  [_AM_DEPENDENCIES([OBJC])],
-		  [m4_define([AC_PROG_OBJC],
-			     m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
-dnl Support for Objective C++ was only introduced in Autoconf 2.65,
-dnl but we still cater to Autoconf 2.62.
-m4_ifdef([AC_PROG_OBJCXX],
-[AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
-		  [_AM_DEPENDENCIES([OBJCXX])],
-		  [m4_define([AC_PROG_OBJCXX],
-			     m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])])dnl
-])
-m4trace:configure.ac:8: -2- _AM_MANGLE_OPTION([no-dependencies])
-m4trace:configure.ac:8: -1- _AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])
-m4trace:configure.ac:8: -2- _AM_MANGLE_OPTION([silent-rules])
-m4trace:configure.ac:12: -1- m4_pattern_allow([^CXX$])
-m4trace:configure.ac:12: -1- m4_pattern_allow([^CXXFLAGS$])
-m4trace:configure.ac:12: -1- m4_pattern_allow([^LDFLAGS$])
-m4trace:configure.ac:12: -1- m4_pattern_allow([^LIBS$])
-m4trace:configure.ac:12: -1- m4_pattern_allow([^CPPFLAGS$])
-m4trace:configure.ac:12: -1- m4_pattern_allow([^CXX$])
-m4trace:configure.ac:12: -1- m4_pattern_allow([^ac_ct_CXX$])
-m4trace:configure.ac:12: -1- m4_pattern_allow([^EXEEXT$])
-m4trace:configure.ac:12: -1- m4_pattern_allow([^OBJEXT$])
-m4trace:configure.ac:12: -1- _AM_DEPENDENCIES([CXX])
-m4trace:configure.ac:12: -1- AM_SET_DEPDIR
-m4trace:configure.ac:12: -1- m4_pattern_allow([^DEPDIR$])
-m4trace:configure.ac:12: -1- AM_OUTPUT_DEPENDENCY_COMMANDS
-m4trace:configure.ac:12: -1- AM_MAKE_INCLUDE
-m4trace:configure.ac:12: -1- m4_pattern_allow([^am__include$])
-m4trace:configure.ac:12: -1- m4_pattern_allow([^am__quote$])
-m4trace:configure.ac:12: -1- AM_DEP_TRACK
-m4trace:configure.ac:12: -1- AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-m4trace:configure.ac:12: -1- m4_pattern_allow([^AMDEP_TRUE$])
-m4trace:configure.ac:12: -1- m4_pattern_allow([^AMDEP_FALSE$])
-m4trace:configure.ac:12: -1- _AM_SUBST_NOTMAKE([AMDEP_TRUE])
-m4trace:configure.ac:12: -1- _AM_SUBST_NOTMAKE([AMDEP_FALSE])
-m4trace:configure.ac:12: -1- m4_pattern_allow([^AMDEPBACKSLASH$])
-m4trace:configure.ac:12: -1- _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])
-m4trace:configure.ac:12: -1- m4_pattern_allow([^am__nodep$])
-m4trace:configure.ac:12: -1- _AM_SUBST_NOTMAKE([am__nodep])
-m4trace:configure.ac:12: -1- m4_pattern_allow([^CXXDEPMODE$])
-m4trace:configure.ac:12: -1- AM_CONDITIONAL([am__fastdepCXX], [
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3])
-m4trace:configure.ac:12: -1- m4_pattern_allow([^am__fastdepCXX_TRUE$])
-m4trace:configure.ac:12: -1- m4_pattern_allow([^am__fastdepCXX_FALSE$])
-m4trace:configure.ac:12: -1- _AM_SUBST_NOTMAKE([am__fastdepCXX_TRUE])
-m4trace:configure.ac:12: -1- _AM_SUBST_NOTMAKE([am__fastdepCXX_FALSE])
-m4trace:configure.ac:13: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:13: -1- m4_pattern_allow([^CFLAGS$])
-m4trace:configure.ac:13: -1- m4_pattern_allow([^LDFLAGS$])
-m4trace:configure.ac:13: -1- m4_pattern_allow([^LIBS$])
-m4trace:configure.ac:13: -1- m4_pattern_allow([^CPPFLAGS$])
-m4trace:configure.ac:13: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:13: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:13: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:13: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:13: -1- m4_pattern_allow([^ac_ct_CC$])
-m4trace:configure.ac:13: -1- _AM_DEPENDENCIES([CC])
-m4trace:configure.ac:13: -1- m4_pattern_allow([^CCDEPMODE$])
-m4trace:configure.ac:13: -1- AM_CONDITIONAL([am__fastdepCC], [
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CC_dependencies_compiler_type" = gcc3])
-m4trace:configure.ac:13: -1- m4_pattern_allow([^am__fastdepCC_TRUE$])
-m4trace:configure.ac:13: -1- m4_pattern_allow([^am__fastdepCC_FALSE$])
-m4trace:configure.ac:13: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_TRUE])
-m4trace:configure.ac:13: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_FALSE])
-m4trace:configure.ac:15: -1- m4_pattern_allow([^RANLIB$])
-m4trace:configure.ac:18: -1- m4_pattern_allow([^LIB@&t@OBJS$])
-m4trace:configure.ac:18: -1- m4_pattern_allow([^LTLIBOBJS$])
-m4trace:configure.ac:18: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
-m4trace:configure.ac:18: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
-m4trace:configure.ac:18: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
-m4trace:configure.ac:18: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
-m4trace:configure.ac:18: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
-m4trace:configure.ac:18: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS

+ 0 - 373
websocket/autom4te.cache/traces.1

@@ -1,373 +0,0 @@
-m4trace:configure.ac:5: -1- AC_INIT([libwebsocket.a], [1.0], [BUG-REPORT-ADDRESS])
-m4trace:configure.ac:5: -1- m4_pattern_forbid([^_?A[CHUM]_])
-m4trace:configure.ac:5: -1- m4_pattern_forbid([_AC_])
-m4trace:configure.ac:5: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS'])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^AS_FLAGS$])
-m4trace:configure.ac:5: -1- m4_pattern_forbid([^_?m4_])
-m4trace:configure.ac:5: -1- m4_pattern_forbid([^dnl$])
-m4trace:configure.ac:5: -1- m4_pattern_forbid([^_?AS_])
-m4trace:configure.ac:5: -1- AC_SUBST([SHELL])
-m4trace:configure.ac:5: -1- AC_SUBST_TRACE([SHELL])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^SHELL$])
-m4trace:configure.ac:5: -1- AC_SUBST([PATH_SEPARATOR])
-m4trace:configure.ac:5: -1- AC_SUBST_TRACE([PATH_SEPARATOR])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^PATH_SEPARATOR$])
-m4trace:configure.ac:5: -1- AC_SUBST([PACKAGE_NAME], [m4_ifdef([AC_PACKAGE_NAME],      ['AC_PACKAGE_NAME'])])
-m4trace:configure.ac:5: -1- AC_SUBST_TRACE([PACKAGE_NAME])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^PACKAGE_NAME$])
-m4trace:configure.ac:5: -1- AC_SUBST([PACKAGE_TARNAME], [m4_ifdef([AC_PACKAGE_TARNAME],   ['AC_PACKAGE_TARNAME'])])
-m4trace:configure.ac:5: -1- AC_SUBST_TRACE([PACKAGE_TARNAME])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^PACKAGE_TARNAME$])
-m4trace:configure.ac:5: -1- AC_SUBST([PACKAGE_VERSION], [m4_ifdef([AC_PACKAGE_VERSION],   ['AC_PACKAGE_VERSION'])])
-m4trace:configure.ac:5: -1- AC_SUBST_TRACE([PACKAGE_VERSION])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^PACKAGE_VERSION$])
-m4trace:configure.ac:5: -1- AC_SUBST([PACKAGE_STRING], [m4_ifdef([AC_PACKAGE_STRING],    ['AC_PACKAGE_STRING'])])
-m4trace:configure.ac:5: -1- AC_SUBST_TRACE([PACKAGE_STRING])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^PACKAGE_STRING$])
-m4trace:configure.ac:5: -1- AC_SUBST([PACKAGE_BUGREPORT], [m4_ifdef([AC_PACKAGE_BUGREPORT], ['AC_PACKAGE_BUGREPORT'])])
-m4trace:configure.ac:5: -1- AC_SUBST_TRACE([PACKAGE_BUGREPORT])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^PACKAGE_BUGREPORT$])
-m4trace:configure.ac:5: -1- AC_SUBST([PACKAGE_URL], [m4_ifdef([AC_PACKAGE_URL],       ['AC_PACKAGE_URL'])])
-m4trace:configure.ac:5: -1- AC_SUBST_TRACE([PACKAGE_URL])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^PACKAGE_URL$])
-m4trace:configure.ac:5: -1- AC_SUBST([exec_prefix], [NONE])
-m4trace:configure.ac:5: -1- AC_SUBST_TRACE([exec_prefix])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^exec_prefix$])
-m4trace:configure.ac:5: -1- AC_SUBST([prefix], [NONE])
-m4trace:configure.ac:5: -1- AC_SUBST_TRACE([prefix])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^prefix$])
-m4trace:configure.ac:5: -1- AC_SUBST([program_transform_name], [s,x,x,])
-m4trace:configure.ac:5: -1- AC_SUBST_TRACE([program_transform_name])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^program_transform_name$])
-m4trace:configure.ac:5: -1- AC_SUBST([bindir], ['${exec_prefix}/bin'])
-m4trace:configure.ac:5: -1- AC_SUBST_TRACE([bindir])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^bindir$])
-m4trace:configure.ac:5: -1- AC_SUBST([sbindir], ['${exec_prefix}/sbin'])
-m4trace:configure.ac:5: -1- AC_SUBST_TRACE([sbindir])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^sbindir$])
-m4trace:configure.ac:5: -1- AC_SUBST([libexecdir], ['${exec_prefix}/libexec'])
-m4trace:configure.ac:5: -1- AC_SUBST_TRACE([libexecdir])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^libexecdir$])
-m4trace:configure.ac:5: -1- AC_SUBST([datarootdir], ['${prefix}/share'])
-m4trace:configure.ac:5: -1- AC_SUBST_TRACE([datarootdir])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^datarootdir$])
-m4trace:configure.ac:5: -1- AC_SUBST([datadir], ['${datarootdir}'])
-m4trace:configure.ac:5: -1- AC_SUBST_TRACE([datadir])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^datadir$])
-m4trace:configure.ac:5: -1- AC_SUBST([sysconfdir], ['${prefix}/etc'])
-m4trace:configure.ac:5: -1- AC_SUBST_TRACE([sysconfdir])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^sysconfdir$])
-m4trace:configure.ac:5: -1- AC_SUBST([sharedstatedir], ['${prefix}/com'])
-m4trace:configure.ac:5: -1- AC_SUBST_TRACE([sharedstatedir])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^sharedstatedir$])
-m4trace:configure.ac:5: -1- AC_SUBST([localstatedir], ['${prefix}/var'])
-m4trace:configure.ac:5: -1- AC_SUBST_TRACE([localstatedir])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^localstatedir$])
-m4trace:configure.ac:5: -1- AC_SUBST([includedir], ['${prefix}/include'])
-m4trace:configure.ac:5: -1- AC_SUBST_TRACE([includedir])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^includedir$])
-m4trace:configure.ac:5: -1- AC_SUBST([oldincludedir], ['/usr/include'])
-m4trace:configure.ac:5: -1- AC_SUBST_TRACE([oldincludedir])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^oldincludedir$])
-m4trace:configure.ac:5: -1- AC_SUBST([docdir], [m4_ifset([AC_PACKAGE_TARNAME],
-				     ['${datarootdir}/doc/${PACKAGE_TARNAME}'],
-				     ['${datarootdir}/doc/${PACKAGE}'])])
-m4trace:configure.ac:5: -1- AC_SUBST_TRACE([docdir])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^docdir$])
-m4trace:configure.ac:5: -1- AC_SUBST([infodir], ['${datarootdir}/info'])
-m4trace:configure.ac:5: -1- AC_SUBST_TRACE([infodir])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^infodir$])
-m4trace:configure.ac:5: -1- AC_SUBST([htmldir], ['${docdir}'])
-m4trace:configure.ac:5: -1- AC_SUBST_TRACE([htmldir])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^htmldir$])
-m4trace:configure.ac:5: -1- AC_SUBST([dvidir], ['${docdir}'])
-m4trace:configure.ac:5: -1- AC_SUBST_TRACE([dvidir])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^dvidir$])
-m4trace:configure.ac:5: -1- AC_SUBST([pdfdir], ['${docdir}'])
-m4trace:configure.ac:5: -1- AC_SUBST_TRACE([pdfdir])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^pdfdir$])
-m4trace:configure.ac:5: -1- AC_SUBST([psdir], ['${docdir}'])
-m4trace:configure.ac:5: -1- AC_SUBST_TRACE([psdir])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^psdir$])
-m4trace:configure.ac:5: -1- AC_SUBST([libdir], ['${exec_prefix}/lib'])
-m4trace:configure.ac:5: -1- AC_SUBST_TRACE([libdir])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^libdir$])
-m4trace:configure.ac:5: -1- AC_SUBST([localedir], ['${datarootdir}/locale'])
-m4trace:configure.ac:5: -1- AC_SUBST_TRACE([localedir])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^localedir$])
-m4trace:configure.ac:5: -1- AC_SUBST([mandir], ['${datarootdir}/man'])
-m4trace:configure.ac:5: -1- AC_SUBST_TRACE([mandir])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^mandir$])
-m4trace:configure.ac:5: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_NAME])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^PACKAGE_NAME$])
-m4trace:configure.ac:5: -1- AH_OUTPUT([PACKAGE_NAME], [/* Define to the full name of this package. */
-@%:@undef PACKAGE_NAME])
-m4trace:configure.ac:5: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_TARNAME])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^PACKAGE_TARNAME$])
-m4trace:configure.ac:5: -1- AH_OUTPUT([PACKAGE_TARNAME], [/* Define to the one symbol short name of this package. */
-@%:@undef PACKAGE_TARNAME])
-m4trace:configure.ac:5: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_VERSION])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^PACKAGE_VERSION$])
-m4trace:configure.ac:5: -1- AH_OUTPUT([PACKAGE_VERSION], [/* Define to the version of this package. */
-@%:@undef PACKAGE_VERSION])
-m4trace:configure.ac:5: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_STRING])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^PACKAGE_STRING$])
-m4trace:configure.ac:5: -1- AH_OUTPUT([PACKAGE_STRING], [/* Define to the full name and version of this package. */
-@%:@undef PACKAGE_STRING])
-m4trace:configure.ac:5: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_BUGREPORT])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^PACKAGE_BUGREPORT$])
-m4trace:configure.ac:5: -1- AH_OUTPUT([PACKAGE_BUGREPORT], [/* Define to the address where bug reports for this package should be sent. */
-@%:@undef PACKAGE_BUGREPORT])
-m4trace:configure.ac:5: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_URL])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^PACKAGE_URL$])
-m4trace:configure.ac:5: -1- AH_OUTPUT([PACKAGE_URL], [/* Define to the home page for this package. */
-@%:@undef PACKAGE_URL])
-m4trace:configure.ac:5: -1- AC_SUBST([DEFS])
-m4trace:configure.ac:5: -1- AC_SUBST_TRACE([DEFS])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^DEFS$])
-m4trace:configure.ac:5: -1- AC_SUBST([ECHO_C])
-m4trace:configure.ac:5: -1- AC_SUBST_TRACE([ECHO_C])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^ECHO_C$])
-m4trace:configure.ac:5: -1- AC_SUBST([ECHO_N])
-m4trace:configure.ac:5: -1- AC_SUBST_TRACE([ECHO_N])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^ECHO_N$])
-m4trace:configure.ac:5: -1- AC_SUBST([ECHO_T])
-m4trace:configure.ac:5: -1- AC_SUBST_TRACE([ECHO_T])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^ECHO_T$])
-m4trace:configure.ac:5: -1- AC_SUBST([LIBS])
-m4trace:configure.ac:5: -1- AC_SUBST_TRACE([LIBS])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^LIBS$])
-m4trace:configure.ac:5: -1- AC_SUBST([build_alias])
-m4trace:configure.ac:5: -1- AC_SUBST_TRACE([build_alias])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^build_alias$])
-m4trace:configure.ac:5: -1- AC_SUBST([host_alias])
-m4trace:configure.ac:5: -1- AC_SUBST_TRACE([host_alias])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^host_alias$])
-m4trace:configure.ac:5: -1- AC_SUBST([target_alias])
-m4trace:configure.ac:5: -1- AC_SUBST_TRACE([target_alias])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^target_alias$])
-m4trace:configure.ac:8: -1- AM_INIT_AUTOMAKE
-m4trace:configure.ac:8: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$])
-m4trace:configure.ac:8: -1- AM_AUTOMAKE_VERSION([1.12.3])
-m4trace:configure.ac:8: -1- AC_REQUIRE_AUX_FILE([install-sh])
-m4trace:configure.ac:8: -1- AC_SUBST([INSTALL_PROGRAM])
-m4trace:configure.ac:8: -1- AC_SUBST_TRACE([INSTALL_PROGRAM])
-m4trace:configure.ac:8: -1- m4_pattern_allow([^INSTALL_PROGRAM$])
-m4trace:configure.ac:8: -1- AC_SUBST([INSTALL_SCRIPT])
-m4trace:configure.ac:8: -1- AC_SUBST_TRACE([INSTALL_SCRIPT])
-m4trace:configure.ac:8: -1- m4_pattern_allow([^INSTALL_SCRIPT$])
-m4trace:configure.ac:8: -1- AC_SUBST([INSTALL_DATA])
-m4trace:configure.ac:8: -1- AC_SUBST_TRACE([INSTALL_DATA])
-m4trace:configure.ac:8: -1- m4_pattern_allow([^INSTALL_DATA$])
-m4trace:configure.ac:8: -1- AC_SUBST([am__isrc], [' -I$(srcdir)'])
-m4trace:configure.ac:8: -1- AC_SUBST_TRACE([am__isrc])
-m4trace:configure.ac:8: -1- m4_pattern_allow([^am__isrc$])
-m4trace:configure.ac:8: -1- _AM_SUBST_NOTMAKE([am__isrc])
-m4trace:configure.ac:8: -1- AC_SUBST([CYGPATH_W])
-m4trace:configure.ac:8: -1- AC_SUBST_TRACE([CYGPATH_W])
-m4trace:configure.ac:8: -1- m4_pattern_allow([^CYGPATH_W$])
-m4trace:configure.ac:8: -1- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])
-m4trace:configure.ac:8: -1- AC_SUBST_TRACE([PACKAGE])
-m4trace:configure.ac:8: -1- m4_pattern_allow([^PACKAGE$])
-m4trace:configure.ac:8: -1- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])
-m4trace:configure.ac:8: -1- AC_SUBST_TRACE([VERSION])
-m4trace:configure.ac:8: -1- m4_pattern_allow([^VERSION$])
-m4trace:configure.ac:8: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE])
-m4trace:configure.ac:8: -1- m4_pattern_allow([^PACKAGE$])
-m4trace:configure.ac:8: -1- AH_OUTPUT([PACKAGE], [/* Name of package */
-@%:@undef PACKAGE])
-m4trace:configure.ac:8: -1- AC_DEFINE_TRACE_LITERAL([VERSION])
-m4trace:configure.ac:8: -1- m4_pattern_allow([^VERSION$])
-m4trace:configure.ac:8: -1- AH_OUTPUT([VERSION], [/* Version number of package */
-@%:@undef VERSION])
-m4trace:configure.ac:8: -1- AC_REQUIRE_AUX_FILE([missing])
-m4trace:configure.ac:8: -1- AC_SUBST([ACLOCAL])
-m4trace:configure.ac:8: -1- AC_SUBST_TRACE([ACLOCAL])
-m4trace:configure.ac:8: -1- m4_pattern_allow([^ACLOCAL$])
-m4trace:configure.ac:8: -1- AC_SUBST([AUTOCONF])
-m4trace:configure.ac:8: -1- AC_SUBST_TRACE([AUTOCONF])
-m4trace:configure.ac:8: -1- m4_pattern_allow([^AUTOCONF$])
-m4trace:configure.ac:8: -1- AC_SUBST([AUTOMAKE])
-m4trace:configure.ac:8: -1- AC_SUBST_TRACE([AUTOMAKE])
-m4trace:configure.ac:8: -1- m4_pattern_allow([^AUTOMAKE$])
-m4trace:configure.ac:8: -1- AC_SUBST([AUTOHEADER])
-m4trace:configure.ac:8: -1- AC_SUBST_TRACE([AUTOHEADER])
-m4trace:configure.ac:8: -1- m4_pattern_allow([^AUTOHEADER$])
-m4trace:configure.ac:8: -1- AC_SUBST([MAKEINFO])
-m4trace:configure.ac:8: -1- AC_SUBST_TRACE([MAKEINFO])
-m4trace:configure.ac:8: -1- m4_pattern_allow([^MAKEINFO$])
-m4trace:configure.ac:8: -1- AC_SUBST([install_sh])
-m4trace:configure.ac:8: -1- AC_SUBST_TRACE([install_sh])
-m4trace:configure.ac:8: -1- m4_pattern_allow([^install_sh$])
-m4trace:configure.ac:8: -1- AC_SUBST([STRIP])
-m4trace:configure.ac:8: -1- AC_SUBST_TRACE([STRIP])
-m4trace:configure.ac:8: -1- m4_pattern_allow([^STRIP$])
-m4trace:configure.ac:8: -1- AC_SUBST([INSTALL_STRIP_PROGRAM])
-m4trace:configure.ac:8: -1- AC_SUBST_TRACE([INSTALL_STRIP_PROGRAM])
-m4trace:configure.ac:8: -1- m4_pattern_allow([^INSTALL_STRIP_PROGRAM$])
-m4trace:configure.ac:8: -1- AC_REQUIRE_AUX_FILE([install-sh])
-m4trace:configure.ac:8: -1- AC_SUBST([MKDIR_P])
-m4trace:configure.ac:8: -1- AC_SUBST_TRACE([MKDIR_P])
-m4trace:configure.ac:8: -1- m4_pattern_allow([^MKDIR_P$])
-m4trace:configure.ac:8: -1- AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
-m4trace:configure.ac:8: -1- AC_SUBST_TRACE([mkdir_p])
-m4trace:configure.ac:8: -1- m4_pattern_allow([^mkdir_p$])
-m4trace:configure.ac:8: -1- AC_SUBST([AWK])
-m4trace:configure.ac:8: -1- AC_SUBST_TRACE([AWK])
-m4trace:configure.ac:8: -1- m4_pattern_allow([^AWK$])
-m4trace:configure.ac:8: -1- AC_SUBST([SET_MAKE])
-m4trace:configure.ac:8: -1- AC_SUBST_TRACE([SET_MAKE])
-m4trace:configure.ac:8: -1- m4_pattern_allow([^SET_MAKE$])
-m4trace:configure.ac:8: -1- AC_SUBST([am__leading_dot])
-m4trace:configure.ac:8: -1- AC_SUBST_TRACE([am__leading_dot])
-m4trace:configure.ac:8: -1- m4_pattern_allow([^am__leading_dot$])
-m4trace:configure.ac:8: -1- AC_SUBST([AMTAR], ['$${TAR-tar}'])
-m4trace:configure.ac:8: -1- AC_SUBST_TRACE([AMTAR])
-m4trace:configure.ac:8: -1- m4_pattern_allow([^AMTAR$])
-m4trace:configure.ac:8: -1- AC_SUBST([am__tar])
-m4trace:configure.ac:8: -1- AC_SUBST_TRACE([am__tar])
-m4trace:configure.ac:8: -1- m4_pattern_allow([^am__tar$])
-m4trace:configure.ac:8: -1- AC_SUBST([am__untar])
-m4trace:configure.ac:8: -1- AC_SUBST_TRACE([am__untar])
-m4trace:configure.ac:8: -1- m4_pattern_allow([^am__untar$])
-m4trace:configure.ac:12: -1- AC_SUBST([CXX])
-m4trace:configure.ac:12: -1- AC_SUBST_TRACE([CXX])
-m4trace:configure.ac:12: -1- m4_pattern_allow([^CXX$])
-m4trace:configure.ac:12: -1- AC_SUBST([CXXFLAGS])
-m4trace:configure.ac:12: -1- AC_SUBST_TRACE([CXXFLAGS])
-m4trace:configure.ac:12: -1- m4_pattern_allow([^CXXFLAGS$])
-m4trace:configure.ac:12: -1- AC_SUBST([LDFLAGS])
-m4trace:configure.ac:12: -1- AC_SUBST_TRACE([LDFLAGS])
-m4trace:configure.ac:12: -1- m4_pattern_allow([^LDFLAGS$])
-m4trace:configure.ac:12: -1- AC_SUBST([LIBS])
-m4trace:configure.ac:12: -1- AC_SUBST_TRACE([LIBS])
-m4trace:configure.ac:12: -1- m4_pattern_allow([^LIBS$])
-m4trace:configure.ac:12: -1- AC_SUBST([CPPFLAGS])
-m4trace:configure.ac:12: -1- AC_SUBST_TRACE([CPPFLAGS])
-m4trace:configure.ac:12: -1- m4_pattern_allow([^CPPFLAGS$])
-m4trace:configure.ac:12: -1- AC_SUBST([CXX])
-m4trace:configure.ac:12: -1- AC_SUBST_TRACE([CXX])
-m4trace:configure.ac:12: -1- m4_pattern_allow([^CXX$])
-m4trace:configure.ac:12: -1- AC_SUBST([ac_ct_CXX])
-m4trace:configure.ac:12: -1- AC_SUBST_TRACE([ac_ct_CXX])
-m4trace:configure.ac:12: -1- m4_pattern_allow([^ac_ct_CXX$])
-m4trace:configure.ac:12: -1- AC_SUBST([EXEEXT], [$ac_cv_exeext])
-m4trace:configure.ac:12: -1- AC_SUBST_TRACE([EXEEXT])
-m4trace:configure.ac:12: -1- m4_pattern_allow([^EXEEXT$])
-m4trace:configure.ac:12: -1- AC_SUBST([OBJEXT], [$ac_cv_objext])
-m4trace:configure.ac:12: -1- AC_SUBST_TRACE([OBJEXT])
-m4trace:configure.ac:12: -1- m4_pattern_allow([^OBJEXT$])
-m4trace:configure.ac:12: -1- AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])
-m4trace:configure.ac:12: -1- AC_SUBST_TRACE([DEPDIR])
-m4trace:configure.ac:12: -1- m4_pattern_allow([^DEPDIR$])
-m4trace:configure.ac:12: -1- AC_SUBST([am__include])
-m4trace:configure.ac:12: -1- AC_SUBST_TRACE([am__include])
-m4trace:configure.ac:12: -1- m4_pattern_allow([^am__include$])
-m4trace:configure.ac:12: -1- AC_SUBST([am__quote])
-m4trace:configure.ac:12: -1- AC_SUBST_TRACE([am__quote])
-m4trace:configure.ac:12: -1- m4_pattern_allow([^am__quote$])
-m4trace:configure.ac:12: -1- AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-m4trace:configure.ac:12: -1- AC_SUBST([AMDEP_TRUE])
-m4trace:configure.ac:12: -1- AC_SUBST_TRACE([AMDEP_TRUE])
-m4trace:configure.ac:12: -1- m4_pattern_allow([^AMDEP_TRUE$])
-m4trace:configure.ac:12: -1- AC_SUBST([AMDEP_FALSE])
-m4trace:configure.ac:12: -1- AC_SUBST_TRACE([AMDEP_FALSE])
-m4trace:configure.ac:12: -1- m4_pattern_allow([^AMDEP_FALSE$])
-m4trace:configure.ac:12: -1- _AM_SUBST_NOTMAKE([AMDEP_TRUE])
-m4trace:configure.ac:12: -1- _AM_SUBST_NOTMAKE([AMDEP_FALSE])
-m4trace:configure.ac:12: -1- AC_SUBST([AMDEPBACKSLASH])
-m4trace:configure.ac:12: -1- AC_SUBST_TRACE([AMDEPBACKSLASH])
-m4trace:configure.ac:12: -1- m4_pattern_allow([^AMDEPBACKSLASH$])
-m4trace:configure.ac:12: -1- _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])
-m4trace:configure.ac:12: -1- AC_SUBST([am__nodep])
-m4trace:configure.ac:12: -1- AC_SUBST_TRACE([am__nodep])
-m4trace:configure.ac:12: -1- m4_pattern_allow([^am__nodep$])
-m4trace:configure.ac:12: -1- _AM_SUBST_NOTMAKE([am__nodep])
-m4trace:configure.ac:12: -1- AC_SUBST([CXXDEPMODE], [depmode=$am_cv_CXX_dependencies_compiler_type])
-m4trace:configure.ac:12: -1- AC_SUBST_TRACE([CXXDEPMODE])
-m4trace:configure.ac:12: -1- m4_pattern_allow([^CXXDEPMODE$])
-m4trace:configure.ac:12: -1- AM_CONDITIONAL([am__fastdepCXX], [
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3])
-m4trace:configure.ac:12: -1- AC_SUBST([am__fastdepCXX_TRUE])
-m4trace:configure.ac:12: -1- AC_SUBST_TRACE([am__fastdepCXX_TRUE])
-m4trace:configure.ac:12: -1- m4_pattern_allow([^am__fastdepCXX_TRUE$])
-m4trace:configure.ac:12: -1- AC_SUBST([am__fastdepCXX_FALSE])
-m4trace:configure.ac:12: -1- AC_SUBST_TRACE([am__fastdepCXX_FALSE])
-m4trace:configure.ac:12: -1- m4_pattern_allow([^am__fastdepCXX_FALSE$])
-m4trace:configure.ac:12: -1- _AM_SUBST_NOTMAKE([am__fastdepCXX_TRUE])
-m4trace:configure.ac:12: -1- _AM_SUBST_NOTMAKE([am__fastdepCXX_FALSE])
-m4trace:configure.ac:13: -1- AC_SUBST([CC])
-m4trace:configure.ac:13: -1- AC_SUBST_TRACE([CC])
-m4trace:configure.ac:13: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:13: -1- AC_SUBST([CFLAGS])
-m4trace:configure.ac:13: -1- AC_SUBST_TRACE([CFLAGS])
-m4trace:configure.ac:13: -1- m4_pattern_allow([^CFLAGS$])
-m4trace:configure.ac:13: -1- AC_SUBST([LDFLAGS])
-m4trace:configure.ac:13: -1- AC_SUBST_TRACE([LDFLAGS])
-m4trace:configure.ac:13: -1- m4_pattern_allow([^LDFLAGS$])
-m4trace:configure.ac:13: -1- AC_SUBST([LIBS])
-m4trace:configure.ac:13: -1- AC_SUBST_TRACE([LIBS])
-m4trace:configure.ac:13: -1- m4_pattern_allow([^LIBS$])
-m4trace:configure.ac:13: -1- AC_SUBST([CPPFLAGS])
-m4trace:configure.ac:13: -1- AC_SUBST_TRACE([CPPFLAGS])
-m4trace:configure.ac:13: -1- m4_pattern_allow([^CPPFLAGS$])
-m4trace:configure.ac:13: -1- AC_SUBST([CC])
-m4trace:configure.ac:13: -1- AC_SUBST_TRACE([CC])
-m4trace:configure.ac:13: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:13: -1- AC_SUBST([CC])
-m4trace:configure.ac:13: -1- AC_SUBST_TRACE([CC])
-m4trace:configure.ac:13: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:13: -1- AC_SUBST([CC])
-m4trace:configure.ac:13: -1- AC_SUBST_TRACE([CC])
-m4trace:configure.ac:13: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:13: -1- AC_SUBST([CC])
-m4trace:configure.ac:13: -1- AC_SUBST_TRACE([CC])
-m4trace:configure.ac:13: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:13: -1- AC_SUBST([ac_ct_CC])
-m4trace:configure.ac:13: -1- AC_SUBST_TRACE([ac_ct_CC])
-m4trace:configure.ac:13: -1- m4_pattern_allow([^ac_ct_CC$])
-m4trace:configure.ac:13: -1- AC_SUBST([CCDEPMODE], [depmode=$am_cv_CC_dependencies_compiler_type])
-m4trace:configure.ac:13: -1- AC_SUBST_TRACE([CCDEPMODE])
-m4trace:configure.ac:13: -1- m4_pattern_allow([^CCDEPMODE$])
-m4trace:configure.ac:13: -1- AM_CONDITIONAL([am__fastdepCC], [
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CC_dependencies_compiler_type" = gcc3])
-m4trace:configure.ac:13: -1- AC_SUBST([am__fastdepCC_TRUE])
-m4trace:configure.ac:13: -1- AC_SUBST_TRACE([am__fastdepCC_TRUE])
-m4trace:configure.ac:13: -1- m4_pattern_allow([^am__fastdepCC_TRUE$])
-m4trace:configure.ac:13: -1- AC_SUBST([am__fastdepCC_FALSE])
-m4trace:configure.ac:13: -1- AC_SUBST_TRACE([am__fastdepCC_FALSE])
-m4trace:configure.ac:13: -1- m4_pattern_allow([^am__fastdepCC_FALSE$])
-m4trace:configure.ac:13: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_TRUE])
-m4trace:configure.ac:13: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_FALSE])
-m4trace:configure.ac:15: -1- AC_SUBST([RANLIB])
-m4trace:configure.ac:15: -1- AC_SUBST_TRACE([RANLIB])
-m4trace:configure.ac:15: -1- m4_pattern_allow([^RANLIB$])
-m4trace:configure.ac:17: -1- AC_CONFIG_FILES([Makefile])
-m4trace:configure.ac:18: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
-m4trace:configure.ac:18: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
-m4trace:configure.ac:18: -1- m4_pattern_allow([^LIB@&t@OBJS$])
-m4trace:configure.ac:18: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
-m4trace:configure.ac:18: -1- AC_SUBST_TRACE([LTLIBOBJS])
-m4trace:configure.ac:18: -1- m4_pattern_allow([^LTLIBOBJS$])
-m4trace:configure.ac:18: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
-m4trace:configure.ac:18: -1- AC_SUBST([am__EXEEXT_TRUE])
-m4trace:configure.ac:18: -1- AC_SUBST_TRACE([am__EXEEXT_TRUE])
-m4trace:configure.ac:18: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
-m4trace:configure.ac:18: -1- AC_SUBST([am__EXEEXT_FALSE])
-m4trace:configure.ac:18: -1- AC_SUBST_TRACE([am__EXEEXT_FALSE])
-m4trace:configure.ac:18: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
-m4trace:configure.ac:18: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
-m4trace:configure.ac:18: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
-m4trace:configure.ac:18: -1- AC_SUBST_TRACE([top_builddir])
-m4trace:configure.ac:18: -1- AC_SUBST_TRACE([top_build_prefix])
-m4trace:configure.ac:18: -1- AC_SUBST_TRACE([srcdir])
-m4trace:configure.ac:18: -1- AC_SUBST_TRACE([abs_srcdir])
-m4trace:configure.ac:18: -1- AC_SUBST_TRACE([top_srcdir])
-m4trace:configure.ac:18: -1- AC_SUBST_TRACE([abs_top_srcdir])
-m4trace:configure.ac:18: -1- AC_SUBST_TRACE([builddir])
-m4trace:configure.ac:18: -1- AC_SUBST_TRACE([abs_builddir])
-m4trace:configure.ac:18: -1- AC_SUBST_TRACE([abs_top_builddir])
-m4trace:configure.ac:18: -1- AC_SUBST_TRACE([INSTALL])
-m4trace:configure.ac:18: -1- AC_SUBST_TRACE([MKDIR_P])

+ 0 - 193
websocket_bak/constdef.h

@@ -1,193 +0,0 @@
-#ifndef _SERVER_CONST_DEF_H_
-#define _SERVER_CONST_DEF_H_
-
-#define MAXCRITICALSECTIONSPINCOUNT 4000
-#define INTERFACE_VERSION "1.0.0.2"
-#define INTERFACE_VERSION_1_1 "1.0.0.1"
-#define INTERFACE_VERSION_1_3 "1.0.0.3"
-#define INTERFACE_VERSION_1_4 "1.0.0.4"
-
-#define TEST_WS_URL  "ws://182.92.224.191:8086"
-#define JSON_ROOT_KEY_CMD "cmd"
-#define JSON_ROOT_KEY_VERSION "version"
-#define JSON_ROOT_KEY_DATA "data"
-#define JSON_ROOT_KEY_TOTAL "total"
-#define JSON_ROOT_KEY_STATISTIC_VEHICLE_DATA "v"
-#define JSON_ROOT_KEY_STATISTIC_STAFF_DATA "s"
-#define JSON_ROOT_KEY_STATISTIC_STAT "stat"
-#define JSON_ROOT_KEY_STATISTIC_DETAIL "detail"
-#define JSON_ROOT_KEY_STATISTIC_GLOBAL "glbl"
-#define JSON_ROOT_KEY_STATISTIC_DEPT "dept"
-#define JSON_ROOT_KEY_STATISTIC_SUM "sum"
-#define JSON_ROOT_KEY_STATISTIC_AREA "area"
-#define JSON_ROOT_KEY_STATISTIC_LEVEL "occupation_level"
-
-// 采集端接收接口
-#define JSON_CMD_VALUE_CLEAR_CARD "clear_card"
-#define JSON_CMD_VALUE_DEAL_HELP "helpme_done"   //deal_help
-#define JSON_CMD_VALUE_DEAL_HELP_RESPONSE "helpme_done_rsp"   //deal_help
-#define JSON_CMD_VALUE_REQUEST_ALL_POSTION "request_all_postion"
-#define JSON_CMD_VALUE_REQUEST_ALL_DATA "req_all_data"
-#define JSON_CMD_VALUE_RESPONSE_ALL_DATA "resp_all_data"
-#define JSON_CMD_VALUE_CALL_CARD_START "call_card_start"
-#define JSON_CMD_VALUE_CALL_CARD_CANCEL "call_card_cancel"
-#define  JSON_CMD_VALUE_LEADER_ARRANGE "leader_arrange"
-//呼叫命令
-#define JSON_CMD_VALUE_CALL_CARD_REQUEST "call_card_req"
-#define JSON_CMD_VALUE_CALL_CARD_RESPONSE "call_card_resp"
-#define JSON_CMD_VALUE_CALL_CARD_CANCEL_REQUEST "call_card_cancel_req"
-#define JSON_CMD_VALUE_CALL_CARD_CANCEL_RESPONSE "call_card_cancel_resp"
-#define JSON_CMD_VALUE_CALL_CARD_LIST "callcardlist"
-
-#define JSON_CMD_VALUE_META_DATA_CHANGED "meta_data_changed"
-#define JSON_CMD_VALUE_LIGHTS_CTRL_REQUEST "light_control"
-#define JSON_CMD_VALUE_LIGHTS_CTRL_RESPONSE "lights_ctrl_res"
-#define JSON_CMD_VALUE_HAND_UP_RESPONSE "deal_hand_up_res"
-
-#define JSON_KEY_ID "id"
-#define JSON_KEY_OP_TYPE "op_type"
-#define JSON_KEY_OP_TYPE_INSERT "INSERT"
-#define JSON_KEY_OP_TYPE_UPDATE "UPDATE"
-#define JSON_KEY_OP_TYPE_DELETE "DELETE"
-
-#define JSON_KEY_NAME "name"
-#define JSON_KEY_NAME_MAP "map"
-#define JSON_KEY_NAME_AREA "area"
-#define JSON_KEY_NAME_PATH "path"
-#define JSON_KEY_NAME_READER "reader"
-#define JSON_KEY_NAME_CARD "card"
-#define JSON_KEY_NAME_STAFF "staff"
-#define JSON_KEY_NAME_STAFF_EXTEND "staff_extend"
-#define JSON_KEY_NAME_VEHICLE "vehicle"
-
-#define JSON_KEY_NAME_VEHICLE_EXTEND "vehicle_extend"
-#define JSON_KEY_NAME_SECTION "section"
-#define JSON_KEY_NAME_LIGHT   "light"
-#define JSON_KEY_NAME_CHAMBER "chamber"
-#define JSON_KEY_NAME_SHIFT "shift"
-#define JSON_KEY_NAME_PATROL_TASK "patrol_task"
-#define JSON_KEY_NAME_RULES "rules"
-#define JSON_KEY_NAME_SETTING "setting"
-#define JSON_KEY_NAME_DRIVINGFACE "drivingface_vehicle"
-#define JSON_KEY_NAME_DRIVINGFACE_WARNING_POINT "dat_drivingface_warning_point"
-#define JSON_KEY_NAME_HAND_UP "dat_handup_vehicle"
-
-#define JSON_KEY_CALL_CARD_CALL_TYPE "call_type_id"
-#define JSON_KEY_CALL_CARD_CALL_TIME_OUT "call_time_out"
-#define JSON_KEY_CALL_CARD_CALL_TIME "call_time"
-#define JSON_KEY_CALL_CARD_CALL_LEVEL "call_level_id"
-#define JSON_KEY_CALL_CARD_USER_NAME "user_name"
-#define JSON_KEY_CALL_CARD_STATIONS "stations"
-#define JSON_KEY_CALL_CARD_STATION_ID "stationid"
-#define JSON_KEY_CALL_CARD_CARDS "cards"
-#define JSON_KEY_CALL_CARD_CARD_ID "cardid"
-#define JSON_KEY_CALL_CARD_CARD_TYPE_ID "cardtype"
-
-#define JSON_KEY_CALL_LIGHT_TASK_ID "task_id"
-#define JSON_KEY_CALL_LIGHT_OBJ_TYPE "obj_type"
-#define JSON_KEY_CALL_LIGHT_CTRL_TYPE "ctrl_type"
-#define JSON_KEY_CALL_LIGHT_LIGHT_STATE "light_state"
-#define JSON_KEY_CALL_LIGHT_USER_ID "user_id"
-#define JSON_KEY_CALL_LIGHT_LIGHTS "lights"
-#define JSON_KEY_CALL_LIGHT_ID "id"
-
-#define JSON_KEY_EDIT_CARD_ID "cardid"
-#define JSON_KEY_EDIT_EDIT_TYPE_ID "edittype"
-
-// 采集端调用接口
-#define JSON_CMD_VALUE_LOGIN "login"
-#define JSON_CMD_VALUE_LOGOUT "logout"
-#define JSON_KEY_USERNAME "user_name"
-#define JSON_KEY_PASSWORD "user_pass"
-#define JSON_VALUE_USERNAME "COLLECTOR"
-#define JSON_VALUE_PASSWORD "666666"  //"666666"
-#define JSON_KEY_CARD_ID "card_id" //"卡号"
-#define JSON_KEY_CARD_TYPE_ID "card_type_id"
-#define JSON_KEY_REC_TIME "rec_time" // "接收时间"
-#define JSON_KEY_DOWN_TIME "down_time" // "入井时间"
-#define JSON_KEY_WORK_TIME "work_time" // "工作时间"
-#define JSON_KEY_ENTER_AREA_TIME "enter_area_time" // "进入区域时间"
-#define JSON_KEY_CORDINATE_X "x"
-#define JSON_KEY_CORDINATE_Y "y"
-#define JSON_KEY_CORDINATE_Z "z"
-#define JSON_KEY_STATE "state" // "状态"
-#define JSON_KEY_STATE_MOVING "state_moving" // 运动状态
-#define JSON_KEY_STATE_BIZ "state_biz" // 业务状态
-#define JSON_KEY_MAP_ID "map_id" // "地图编号"
-#define JSON_KEY_DEPT_ID "dept_id"
-#define JSON_KEY_SPEED "speed"	//速度
-#define JSON_KEY_LANDMARK_ID "landmark_id"
-#define JSON_KEY_DIRECTORY_ID "landmark_direction_id"
-#define JSON_KEY_LANDMARK_DIS "landmark_distance"
-
-// id, name, type, map_id
-#define JSON_KEY_AREA_ID "area_id" // "区域编号"
-#define JSON_KEY_AREA_IS_SPECIAL "is_special_area" // "区域名称"
-// down_mine,up_mine
-#define JSON_CMD_VALUE_DOWN_MINE "down_mine"
-#define JSON_CMD_VALUE_UP_MINE "up_mine"
-#define JSON_CMD_VALUE_SPECIAL_AREA_UP_MINE "special_area_up_mine"
-#define JSON_CMD_VALUE_DEV_STATE "device_state"
-#define JSON_CMD_VALUE_EVENT "event"
-#define JSON_CMD_VALUE_CALL "CALL"
-#define JSON_CMD_VALUE_PUSH "PUSH"
-#define JSON_CMD_VALUE_USER "USER"
-#define JSON_CMD_DRIVING_FACE_STATE "tunneller_stat"
-// pos_map
-#define JSON_CMD_VALUE_POS_MAP "pos_map"
-
-// 告警事件
-#define JSON_KEY_EVENT_EVENT_ID "event_id"
-#define JSON_KEY_EVENT_STATUS "status"
-#define JSON_KEY_EVENT_TYPE_ID "type_id"
-#define JSON_KEY_EVENT_OBJ_TYPE_ID "obj_type_id"
-#define JSON_KEY_EVENT_OBJ_ID "obj_id"
-#define JSON_KEY_EVENT_MAP_ID "map_id"
-#define JSON_KEY_EVENT_AREA_ID "area_id"
-#define JSON_KEY_EVENT_X "x"
-#define JSON_KEY_EVENT_Y "y"
-#define JSON_KEY_EVENT_LIMIT_VALUE "limit_value"
-#define JSON_KEY_EVENT_CUR_VALUE "cur_value"
-#define JSON_KEY_EVENT_CUR_TIME "cur_time"
-#define JSON_KEY_EVENT_LANDMARK_ID "lmid"
-#define JSON_KEY_EVENT_LANDMARK_DIRECTION "lmdirect"
-#define JSON_KEY_EVENT_LANDMARK_DISTANCE "lmdistance"
-#define JSON_KEY_EVENT_READER_POS_CHANGE    "reader_pos_change"
-
-// alarm
-#define JSON_KEY_ALARM_OVER_COUNT_PERSON "over_count_person"
-#define JSON_KEY_ALARM_OVER_COUNT_VEHICLE "over_count_vehicle"
-#define JSON_KEY_ALARM_OVER_TIME_PERSON "over_time_person"
-#define JSON_KEY_ALARM_OVER_TIME_VEHICLE "over_time_vehicle"
-#define JSON_KEY_ALARM_OVER_SPEED_VEHICLE "over_speed_vehicle"
-
-#define JSON_KEY_ALARM_START_TIME "alarm_start_time"
-
-#define JSON_KEY_ALARM_STAFFER_ID "staffer_id"
-#define JSON_KEY_ALARM_VEHICLE_ID "vehicle_id"
-
-#define JSON_KEY_ALARM_SECTION "section_info"
-#define JSON_KEY_ALARM_SECTION_ID "section_id"
-#define JSON_KEY_ALARM_SECTION_VEHICLE_COUNTS "vehicle_counts"
-#define JSON_KEY_ALARM_SECTION_STAFFER_COUNTS "staffer_counts"
-#define JSON_KEY_ALARM_SECTION_STATE "state"
-
-#define JSON_KEY_ALARM_LIGHT "light_info"
-#define JSON_KEY_ALARM_LIGHT_ID "light_id"
-#define JSON_KEY_ALARM_LIGHT_GROUP_ID "light_group_id"
-#define JSON_KEY_ALARM_LIGHT_GROUP_NAME	"light_group_name"
-
-#define JSON_KEY_ALARM_TRAFFIC_RED_LIGHT "traffic_red_light"
-// 掘进面
-#define JSON_KEY_DRIVINGFACE_DIS "driving_face_moving_dis"
-#define JSON_KEY_DRIVINGFACE_WARNING_POINT_ID "driving_face_warning_point_id"
-#define JSON_KEY_DRIVINGFACE_WARNING_POINT_DIS "driving_face_warning_point_dis"
-
-#define JSON_KEY_DRIVINGFACE_CURSHIFT_LENGTH "drivingface_curshift_length"
-
-//人上车状态
-#define JSON_KEY_PERSON_ON_CAR "person_on_car"
-#define JSON_CMD_REQ_ALL_PERSON_ON_CAR "req_all_person_on_car"
-#define JSON_CMD_RESP_ALL_PERSON_ON_CAR "resp_all_person_on_car"
-
-#endif // !_SERVER_CONST_DEF_H_

+ 0 - 196
websocket_bak/jsonBuilder.cpp

@@ -1,196 +0,0 @@
-#include "jsonBuilder.h"
-
-
-#include <rapidjson/writer.h>
-#include <rapidjson/stringbuffer.h>
-#include <rapidjson/prettywriter.h>
-#include "constdef.h"
-
-namespace YA
-{
-
-	jsonBuilder::jsonBuilder()
-	{
-
-
-	}
-
-	jsonBuilder::~jsonBuilder()
-	{
-
-	}
-
-	void jsonBuilder::__AddVersion( rapidjson::Value& root, rapidjson::Document::AllocatorType& allocator )
-	{
-		rapidjson::Value key( rapidjson::kStringType );
-		rapidjson::Value value( rapidjson::kStringType );
-
-		key.SetString( JSON_ROOT_KEY_VERSION, allocator );
-		value.SetString( JASON_CURRENT_VERSION, allocator );
-		root.AddMember( key, value, allocator );
-	}
-
-	std::string jsonBuilder::BuildLogin( const _JS_LOGIN_& Login )
-	{
-		rapidjson::StringBuffer sb;
-		rapidjson::Writer<rapidjson::StringBuffer> writer( sb );
-
-		rapidjson::Document doc;
-
-		rapidjson::Document::AllocatorType& allocator = doc.GetAllocator();
-		rapidjson::Value root( rapidjson::kObjectType );
-		rapidjson::Value child( rapidjson::kObjectType );
-		rapidjson::Value key( rapidjson::kStringType );
-		rapidjson::Value value( rapidjson::kStringType );
-
-		key.SetString( JSON_ROOT_KEY_CMD, allocator );
-		value.SetString( JASON_CMD_LOGIN, allocator );
-		root.AddMember( key, value, allocator );
-
-		key.SetString( JSON_KEY_USERNAME, allocator );
-		value.SetString( Login.user_name.c_str(), allocator );
-		child.AddMember( key, value, allocator );
-
-		key.SetString( JSON_KEY_PASSWORD, allocator );
-		value.SetString( Login.user_password.c_str(), allocator );
-		child.AddMember( key, value, allocator );
-
-		key.SetString( JSON_ROOT_KEY_DATA, allocator );
-		root.AddMember( key, child, allocator );
-
-		root.Accept( writer );
-
-		return sb.GetString();
-	}
-
-	bool jsonBuilder::ParseCall_Card_Req( const std::string& JasonText, _JS_CALL_CARD_REQ_& CallCardReq, std::string& Error )
-	{
-		rapidjson::Document doc;
-		if ( doc.Parse( JasonText.c_str() ).HasParseError() )
-		{
-			Error = "Failed to parse jason text!";
-			return false;
-		}
-
-		rapidjson::Value::MemberIterator itValue;
-		itValue = doc.FindMember( "data" );
-		if ( itValue == doc.MemberEnd() )
-		{
-			Error = "Failed to find member: data!";
-			return false;
-		}
-
-		rapidjson::Value Data;
-		rapidjson::Document::AllocatorType allocator;
-		Data.CopyFrom( itValue->value, allocator );
-
-		if ( !Data.HasMember( JSON_KEY_CALL_CARD_CALL_TYPE ) )
-		{
-			Error = "Failed to find value: ";
-			Error += JSON_KEY_CALL_CARD_CALL_TYPE;
-			return false;
-		}
-		CallCardReq.call_type_id = Data[JSON_KEY_CALL_CARD_CALL_TYPE].GetInt();
-
-		if ( !Data.HasMember( JSON_KEY_CALL_CARD_CALL_TIME_OUT ) )
-		{
-			Error = "Failed to find value: ";
-			Error += JSON_KEY_CALL_CARD_CALL_TIME_OUT;
-			return false;
-		}
-		CallCardReq.call_time_out = Data[JSON_KEY_CALL_CARD_CALL_TIME_OUT].GetInt();
-
-		if ( !Data.HasMember( JSON_KEY_CALL_CARD_CALL_LEVEL ) )
-		{
-			Error = "Failed to find value: ";
-			Error += JSON_KEY_CALL_CARD_CALL_LEVEL;
-			return false;
-		}
-		CallCardReq.call_time_interval = Data[JSON_KEY_CALL_CARD_CALL_LEVEL].GetInt();
-
-		if ( !Data.HasMember( JSON_KEY_CALL_CARD_USER_NAME ) )
-		{
-			Error = "Failed to find value: ";
-			Error += JSON_KEY_CALL_CARD_USER_NAME;
-			return false;
-		}
-		CallCardReq.user_name = Data[JSON_KEY_CALL_CARD_USER_NAME].GetString();
-
-		//data::stations
-		if ( !Data.HasMember( JSON_KEY_CALL_CARD_STATIONS ) )
-		{
-			Error = "Failed to find value: ";
-			Error += JSON_KEY_CALL_CARD_STATIONS;
-			return false;
-		}
-		rapidjson::Value & stations = Data[JSON_KEY_CALL_CARD_STATIONS];
-		if ( !stations.IsArray() )
-		{
-			Error = "data::stations is not a valid array!";
-			return false;
-		}
-		for ( int i = 0; i <(int) stations.Size(); ++i )
-		{
-			rapidjson::Value & v = stations[i];
-			if ( !v.IsObject() )
-			{
-				char szError[1024] = { 0 };
-				sprintf( szError, "data::stations[%d] is not a object!", i );
-				Error = szError;
-				return false;
-			}
-
-			_JS_STATION_ Station;
-			if ( !v.HasMember( JSON_KEY_CALL_CARD_STATION_ID ) && v[JSON_KEY_CALL_CARD_STATION_ID].IsInt() )
-			{
-				Error = "Error, failed to found value: ";
-				Error += JSON_KEY_CALL_CARD_STATION_ID;
-				return false;
-			}
-			Station.stationid = v[JSON_KEY_CALL_CARD_STATION_ID].GetInt();
-
-			CallCardReq.stations.push_back( Station );
-		}
-
-		//data::cards
-		if ( !Data.HasMember( JSON_KEY_CALL_CARD_CARDS ) )
-		{
-			Error = "Failed to find value: ";
-			Error += JSON_KEY_CALL_CARD_CARDS;
-			return false;
-		}
-		rapidjson::Value & cards = Data[JSON_KEY_CALL_CARD_CARDS];
-		for ( int i = 0; i < (int)cards.Size(); ++i )
-		{
-			rapidjson::Value & v = cards[i];
-			if ( !v.IsObject() )
-			{
-				char szError[1024] = { 0 };
-				sprintf( szError, "data::cards[%d] is not a object!", i );
-				Error = szError;
-				return false;
-			}
-
-			_JS_CARD_ Card;
-			if ( !v.HasMember( JSON_KEY_CALL_CARD_CARD_ID ) && v[JSON_KEY_CALL_CARD_CARD_ID].IsInt() )
-			{
-				Error = "Error, failed to found value: ";
-				Error += JSON_KEY_CALL_CARD_CARD_ID;
-				return false;
-			}
-			Card.cardid = v[JSON_KEY_CALL_CARD_CARD_ID].GetInt();
-
-			if ( !v.HasMember( JSON_KEY_CALL_CARD_CARD_TYPE_ID ) && v[JSON_KEY_CALL_CARD_CARD_TYPE_ID].IsInt() )
-			{
-				Error = "Error, failed to found value: ";
-				Error += JSON_KEY_CALL_CARD_CARD_TYPE_ID;
-				return false;
-			}
-			Card.cardtype = v[JSON_KEY_CALL_CARD_CARD_TYPE_ID].GetInt();
-
-			CallCardReq.cards.push_back( Card );
-		}
-
-		return true;
-	}
-}

+ 0 - 67
websocket_bak/jsonBuilder.h

@@ -1,67 +0,0 @@
-#ifndef _JSONBUILDER_H_
-#define _JSONBUILDER_H_
-
-#include <rapidjson/document.h>
-#include "jsonCommon.h"
-
-namespace YA
-{
-	class jsonBuilder
-	{
-	private:
-		/**
-		* @brief
-		加上版本信息函数。
-
-		* @param  [out] rapidjson::Value& root  根jason对象\n
-		* @param  [out] rapidjson::Document::AllocatorType& allocator  分配器\n
-
-		* @return 无\n
-
-		* @note
-
-		* @warning
-
-		* @bug
-
-		*/
-        void __AddVersion( rapidjson::Value& root, rapidjson::Document::AllocatorType& allocator );
-	public:
-		jsonBuilder();
-		virtual ~jsonBuilder();
-		/**
-		* @brief
-		生成登录jason函数。
-
-		* @param  [in] const _JS_LOGIN_& Login  登录参数\n
-
-		* @return 如果成功返回生成的json字符串,否则返回空字符串\n
-
-		* @note
-
-		* @warning
-
-		* @bug
-
-		*/
-		std::string BuildLogin( const _JS_LOGIN_& Login );
-		/**
-		* @brief
-		解析呼叫结构体函数。
-
-		* @param  [in] const _JS_LOGIN_& Login  登录参数\n
-
-		* @return 如果成功返回生成的jason字符串,否则返回空字符串\n
-
-		* @note
-
-		* @warning
-
-		* @bug
-
-		*/
-		bool ParseCall_Card_Req( const std::string& JasonText, _JS_CALL_CARD_REQ_& CallCardReq, std::string& Error );
-	};
-}
-
-#endif /* _JSONBUILDER_H_ */

+ 0 - 309
websocket_bak/jsonCommon.h

@@ -1,309 +0,0 @@
-/**
-* @brief
-jason公共头文件
-
-* @version
-V 1.0.0
-
-* @author
-王益俊
-
-* @date
-创建时间:  2018-04-19\n
-
-* @note
-2018-04-19  初次创建。\n
-
-* @warning
-
-* @bug
-
-*/
-
-#ifndef _JSON_COMMON_H_
-#define _JSON_COMMON_H_
-
-#include <string>
-#include <vector>
-
-#include <rapidjson/document.h>
-#include <rapidjson/pointer.h>
-
-namespace YA
-{
-
-//----------------------------------------------------------------------------
-//                                 命令
-//----------------------------------------------------------------------------
-const char JASON_CMD_LOGIN[]              = "login";
-
-
-//----------------------------------------------------------------------------
-//                                 字段
-//----------------------------------------------------------------------------
-const char JASON_FIELD_CMD[]              = "cmd";
-
-//----------------------------------------------------------------------------
-//                                 版本
-//----------------------------------------------------------------------------
-const char JASON_CURRENT_VERSION[]        = "1.0.0.4";
-
-
-/**
- * @brief
- 通用jason包结构体
- */
-struct _JS_PACK_
-{
-public:
-	rapidjson::Document m_Doc;//jason文档对象
-public:
-    _JS_PACK_()
-	{
-
-	}
-    /**
-	* @brief
-	获得命令字函数。
-
-	* @param  [out] std::string& Error  错误信息\n
-
-	* @return 如果成功返回获得的命令字,否则返回空字符串\n
-
-	* @note
-
-	* @warning
-
-	* @bug
-
-	*/
-    std::string GetCmd( std::string& Error )
-    {
-    	rapidjson::Value::MemberIterator itMember;
-    	itMember = m_Doc.FindMember( JASON_FIELD_CMD );
-		if ( itMember == m_Doc.MemberEnd() )
-		{
-			Error = "Error,Failed to find member: ";
-			Error += JASON_FIELD_CMD;
-			return "";
-		}
-
-    	return m_Doc[JASON_FIELD_CMD].GetString();
-    }
-    /**
-	* @brief
-	获得成员函数。
-
-    * @param  [in] const std::string& MemberName  成员名称\n
-    * @param  [out] rapidjson::Value& Member  获得的成员\n
-	* @param  [out] std::string& Error  错误信息\n
-
-	* @return 如果成功返回true,否则返回false\n
-
-	* @note
-
-	* @warning
-
-	* @bug
-
-	*/
-    bool GetMember( const std::string& MemberName, rapidjson::Value& Member, std::string& Error )
-    {
-    	rapidjson::Value::MemberIterator itMember;
-    	itMember = m_Doc.FindMember( MemberName.c_str() );
-		if ( itMember == m_Doc.MemberEnd() )
-		{
-			Error = "Error,Failed to find member: ";
-			Error += MemberName;
-			return false;
-		}
-
-		rapidjson::Document::AllocatorType allocator;
-		Member.CopyFrom( itMember->value, allocator );
-
-    	return true;
-    }
-    /**
-	* @brief
-	获得指定成员的值函数。
-
-	* @param  [in] const std::string& MemberName  指定成员\n
-	* @param  [in] const std::string& ValueName  值名称\n
-	* @param  [out] rapidjson::Value& Member  获得的值\n
-	* @param  [out] std::string& Error  错误信息\n
-
-	* @return 如果成功返回true,否则返回false\n
-
-	* @note
-
-	* @warning
-
-	* @bug
-
-	*/
-    bool GetValue( const rapidjson::Value& Member, const std::string& ValueName, rapidjson::Value& Value, std::string& Error )
-    {
-    	rapidjson::Value::ConstMemberIterator itValue;
-    	itValue = Member.FindMember( ValueName.c_str() );
-    	if ( itValue == Member.MemberEnd() )
-		{
-    		char szError[256] = { 0 };
-    		sprintf( szError, "Error,Failed to find: %s", ValueName.c_str() );
-			Error = szError;
-			return false;
-		}
-
-    	rapidjson::Document::AllocatorType allocator;
-    	Value.CopyFrom( itValue->value, allocator );
-
-    	return true;
-    }
-	/**
-	 * @brief
-	 根据jason pointer获得指定的值函数。
-
-	 * @param  [in] const char* JPointer  指定的jason pointer\n
-
-	 * @return 返回获得的值\n
-
-	 * @note
-
-	 * @warning
-
-	 * @bug
-
-	 */
-    const rapidjson::Value* GetValueByJP( const char* JPointer )
-    {
-    	if ( 0 == JPointer )
-    	{
-            return 0;
-    	}
-
-    	return rapidjson::GetValueByPointer( m_Doc, rapidjson::Pointer( JPointer ) );
-    }
-	/**
-	 * @brief
-	 获得所有成员函数。
-
-	 * @param  无\n
-
-	 * @return 返回获得的所有成员的列表\n
-
-	 * @note
-
-	 * @warning
-
-	 * @bug
-
-	 */
-	std::vector<std::string> GetMembers()
-	{
-		std::vector<std::string> vMembers;
-
-		for (auto& m : m_Doc.GetObject())
-		{
-			vMembers.push_back( m.name.GetString() );
-		}
-
-		return vMembers;
-	}
-};
-
-/**
- * @brief
- 分站结构体
- */
-struct _JS_COMMON_
-{
-    std::string version;//版本
-	_JS_COMMON_()
-	{
-
-	}
-};
-
-/**
- * @brief
- 分站结构体
- */
-struct _JS_STATION_
-{
-	int stationid;//分站ID
-	_JS_STATION_()
-	{
-		stationid = 0;
-	}
-};
-
-/**
- * @brief
- 卡结构体
- */
-struct _JS_CARD_
-{
-	int cardid;//卡ID
-	int cardtype;//卡类型
-	_JS_CARD_()
-	{
-		cardid    = 0;
-		cardtype  = 0;
-	}
-};
-
-/**
- * @brief
- 呼叫结构体
- */
-struct _JS_CALL_CARD_REQ_ : public _JS_COMMON_
-{
-	int call_type_id;//呼叫类型(0 全员, 1定员)
-	int call_time_out;//呼叫时长(单位分钟)
-	int call_level_id;//呼叫级别(0一般呼叫,1紧急呼叫)
-	std::string user_name;//用户
-	long long call_time_interval;//呼叫间隔
-	std::vector<_JS_STATION_> stations;//分站列表
-	std::vector<_JS_CARD_> cards;//呼叫的卡列表
-	_JS_CALL_CARD_REQ_()
-	{
-		call_type_id       = 0;
-		call_time_out      = 0;
-		call_level_id      = 0;
-		call_time_interval = 0;
-	}
-};
-
-/**
- * @brief
- 取消呼叫结构体
- */
-struct _JS_CALL_CARD_CANCEL_REQ_ : public _JS_COMMON_
-{
-	int call_type_id;//呼叫类型(0 全员, 1定员)
-	std::string user_name;//用户
-	long long call_time;//取消时间
-	std::vector<_JS_STATION_> stations;//分站列表
-	std::vector<_JS_CARD_> cards;//呼叫的卡列表
-	_JS_CALL_CARD_CANCEL_REQ_()
-	{
-		call_type_id   = 0;
-		call_time      = 0;
-	}
-};
-
-/**
- * @brief
- 数据库连接设置结构体
- */
-struct _JS_LOGIN_
-{
-	std::string user_name;//用户名
-	std::string user_password;//密码
-	_JS_LOGIN_()
-	{
-
-	}
-};
-}
-
-#endif//_JSON_COMMON_H_

+ 0 - 36
websocket_bak/singleton_test_class1.cpp

@@ -1,36 +0,0 @@
-#include "singleton_test_class1.h"
-#include "wsClientMgr.h"
-#include <iostream>
-
-singleton_test_class1::singleton_test_class1()
-{
-	
-}
-
-singleton_test_class1::~singleton_test_class1()
-{
-
-}
-
-void singleton_test_class1::DoSome()
-{
-	std::cout << "-- singleton_test_class1::DoSome() --" << std::endl;
-
-	if ( swsClientMgr.IsConnected() )
-	{
-		std::cout << "swsClientMgr Is Connected!" << std::endl;
-	}
-	else
-	{
-		std::cout << "swsClientMgr Is not Connected!" << std::endl;
-	}
-
-	if ( swsClientMgr.IsLogined() )
-	{
-		std::cout << "swsClientMgr Is Logined!" << std::endl;
-	}
-	else
-	{
-		std::cout << "swsClientMgr Is not Logined!" << std::endl;
-	}
-}

+ 0 - 9
websocket_bak/singleton_test_class1.h

@@ -1,9 +0,0 @@
-#pragma once
-
-class singleton_test_class1
-{
-public:
-	singleton_test_class1();
-	~singleton_test_class1();
-	void DoSome();
-};

BIN
websocket_bak/socket.io-client-cpp_test.cpp


+ 0 - 226
websocket_bak/thread_safe_map.h

@@ -1,226 +0,0 @@
-/**
-* @brief
-线程安全模板类
-
-* @version
-  V 1.0.0
-
-* @author
-  王益俊
-
-* @date
-  创建时间:  2018-08-20\n
-
-* @note
-  2018-08-20  创建类。\n
-
-* @warning
-
-* @bug
-  
-*/
-
-#pragma once
-
-#include <map>
-#include <stdint.h>
-#include <boost/thread/mutex.hpp>
-
-template<class Key, class T>
-class thread_safe_map
-{
-private:
-	std::map<Key, T> __map;
-	mutable boost::mutex the_mutex;
-public:
-	/**
-	* @brief
-	重置函数。
-
-	* @param  [in] const Key &inputKey  key\n
-	* @param  [in] const T &inputValue  value\n
-
-	* @return 无\n
-
-	* @note
-
-	* @warning
-
-	* @bug
-
-	*/
-	void insert( const Key &inputKey, const T &inputValue )
-	{
-		boost::mutex::scoped_lock lock( the_mutex );
-		__map.insert( std::pair<Key, T>( inputKey, inputValue ) );
-		lock.unlock();
-	}
-	/**
-	* @brief
-	返回map是否为空函数。
-
-	* @param  无\n
-
-	* @return 是否为空\n
-	* @retval  true  为空\n
-    * @retval  false  不为空\n
-
-	* @note
-
-	* @warning
-
-	* @bug
-
-	*/
-	bool empty() const 
-	{
-		boost::mutex::scoped_lock lock( the_mutex );
-		return __map.empty();
-	}
-	/**
-	* @brief
-	用某个key获取值的函数。
-
-	* @param  [in] const Key &inputKey  指定的key\n
-	* @param  [out] T &outputValue  获得的值\n
-
-	* @return 是否获取成功\n
-	* @retval  true  成功\n
-    * @retval  false  失败\n
-
-	* @note
-
-	* @warning
-
-	* @bug
-
-	*/
-	bool get( const Key &inputKey, T &outputValue ) 
-	{
-		boost::mutex::scoped_lock lock( the_mutex );
-
-		typename std::map<Key, T>::iterator it;
-		it = __map.find( inputKey );
-
-		if ( __map.end() == it ) 
-		{
-			return false;
-		}
-
-		outputValue = it->second;
-		return true;
-	}
-	/**
-	* @brief
-	更新某个key对应值的函数。
-
-	* @param  [in] const Key &inputKey  指定的key\n
-	* @param  [out] T &outputValue  获得的值\n
-
-	* @return 是否获取成功\n
-	* @retval  true  成功\n
-    * @retval  false  失败\n
-
-	* @note
-
-	* @warning
-
-	* @bug
-
-	*/
-	bool update( const Key &inputKey, const T &inputValue )
-	{
-		boost::mutex::scoped_lock lock( the_mutex );
-
-		typename std::map<Key, T>::iterator it;
-		it = __map.find( inputKey );
-
-		if ( __map.end() == it ) 
-		{
-			return false;
-		}
-
-		it->second = inputValue;
-		return true;
-	}
-	/**
-	* @brief
-	根据某个key删除值的函数。
-
-	* @param  [in] const Key &inputKey  指定的key\n
-
-	* @return 无\n
-
-	* @note
-
-	* @warning
-
-	* @bug
-
-	*/
-	void erase( const Key &inputKey )
-	{
-		boost::mutex::scoped_lock lock( the_mutex );
-		__map.erase( inputKey );
-	}
-	/**
-	* @brief
-	获得大小的函数。
-
-	* @param  无\n
-
-	* @return 无\n
-
-	* @note
-
-	* @warning
-
-	* @bug
-
-	*/
-	size_t size() const
-	{
-		boost::mutex::scoped_lock lock( the_mutex );
-		return __map.size();
-	}
-	/**
-	* @brief
-	清除map的函数。
-
-	* @param  无\n
-
-	* @return 无\n
-
-	* @note
-
-	* @warning
-
-	* @bug
-
-	*/
-	void clear()
-	{
-		boost::mutex::scoped_lock lock( the_mutex );
-		__map.clear();
-	}
-	/**
-	* @brief
-	拷贝map的函数。
-
-	* @param  无\n
-
-	* @return 无\n
-
-	* @note
-
-	* @warning
-
-	* @bug
-
-	*/
-	void copy( std::map<Key, T>& dest_map )
-	{
-		boost::mutex::scoped_lock lock( the_mutex );
-		dest_map = __map;
-	}
-};

+ 0 - 253
websocket_bak/wsClient.cpp

@@ -1,253 +0,0 @@
-#include "wsClient.h"
-#include "constdef.h"
-#include <thread>
-#include <chrono>
-#include <boost/locale.hpp>
-
-
-namespace YA
-{
-	const int _LOGIN_SLEEP_TIME_      = 500;//登录前的等待时间(单位:毫秒)
-	const int _OPEN_SOCKET_WAIT_TIME_ = 100;//等待打开socket时间(单位:毫秒)
-
-	wsClient::wsClient()
-	{
-		__ID = 0;
-		_reset();
-	}
-
-	wsClient::~wsClient()
-	{
-
-	}
-
-	
-
-	void wsClient::_reset()
-	{
-		__Connected = false;
-		__SktOpened = false;
-		__Logined = false;
-	}
-
-	void wsClient::init( int ID, const std::string & uri, const std::map<std::string, MSG_HANDLE_FUNC_TYPE>& MsgFuncList )
-	{
-		__ID          = ID;
-		__uri         = uri;
-		__MsgFuncList = MsgFuncList;
-		__wsclient.set_reconnect_attempts( 0 );
-		using std::placeholders::_1;
-		using std::placeholders::_2;
-		using std::placeholders::_3;
-		using std::placeholders::_4;
-		sio::socket::ptr sock = __wsclient.socket();
-
-		__wsclient.set_open_listener( std::bind( &wsClient::_on_connected, this ) );
-		__wsclient.set_close_listener( std::bind( &wsClient::_on_close, this, std::placeholders::_1 ) );
-		__wsclient.set_reconnect_listener( std::bind( &wsClient::_on_reconnect, this, std::placeholders::_1, std::placeholders::_2 ) );
-		__wsclient.set_fail_listener( std::bind( &wsClient::_on_fail, this ) );
-		__wsclient.set_socket_open_listener( std::bind( &wsClient::_on_socket_opened, this ) );
-
-		sock->on( JSON_CMD_VALUE_CALL, sio::socket::event_listener_aux( std::bind( &wsClient::_OnCallMessage, this, _1, _2, _3, _4 ) ) );
-		sock->on( "code", sio::socket::event_listener_aux( std::bind( &wsClient::_OnLoginResponse, this, _1, _2, _3, _4 ) ) );
-	}
-
-	std::string wsClient::get_uri()
-	{
-		return __uri;
-	}
-
-	int wsClient::connect( int time_out )
-	{
-		if ( __uri.empty() )
-		{
-			__LastError = "Error, uri is empty.";
-			return -1;
-		}
-
-		__wsclient.connect( __uri );
-
-		std::cv_status status = std::cv_status::timeout;
-
-		int nRet = -1;
-		__lock.lock();
-		if ( !IsConnected() )
-		{
-			status = __cond.wait_for( __lock, std::chrono::seconds( time_out ) );
-
-			if ( std::cv_status::timeout == status )
-			{
-				__LastError = "Failed to connect server.";
-				nRet = -1;
-			}
-			else
-			{
-				nRet = 0;
-			}
-		}
-		else
-		{
-			nRet = 0;
-		}
-		__lock.unlock();
-
-		return nRet;
-	}
-
-	void wsClient::login()
-	{
-		char szError[512] = { 0 };
-
-		if ( !IsConnected() )
-		{
-			__LastError = "please connect server before login!";
-			return;
-		}
-
-		std::cv_status status = std::cv_status::timeout;
-		__lock.lock();
-		if ( !IsSktOpened() )
-		{
-			status = __cond.wait_for( __lock, std::chrono::milliseconds( _OPEN_SOCKET_WAIT_TIME_ ) );
-		}
-		__lock.unlock();
-
-		if ( !IsSktOpened() )
-		{
-			__LastError = "socket is not opened before login!";
-			return;
-		}
-
-		std::this_thread::sleep_for( std::chrono::milliseconds( _LOGIN_SLEEP_TIME_ ) );
-		
-		int nRet = 0;
-		YA::_JS_LOGIN_ Login;
-		Login.user_name = JSON_VALUE_USERNAME;
-		Login.user_password = JSON_VALUE_PASSWORD;
-
-		std::string strLogin = __jsBuilder.BuildLogin( Login );
-		strLogin += "\n";
-		sio::socket::ptr skt_ptr;
-		skt_ptr = __wsclient.socket();
-		skt_ptr->emit( JSON_CMD_VALUE_USER, strLogin, [&]( sio::message::list const& msglist )
-		{
-			sio::message::ptr msg_ptr = msglist[0];
-			nRet = ( int ) msg_ptr->get_map()["code"]->get_int();
-			if ( 0 == nRet )
-			{
-				__Logined = true;
-			}
-			else
-			{
-				__Logined = false;
-				sprintf( szError, "Login failed,code=%d", nRet );
-				__LastError = szError;
-			}
-		} );
-	}
-
-	void wsClient::_on_connected()
-	{
-		__lock.lock();
-		__cond.notify_all();
-		__Connected = true;
-		__lock.unlock();
-	}
-
-	void wsClient::send( const std::string & Cmd, const std::string & Data )
-	{
-		std::lock_guard<std::recursive_mutex> lock( __send_lock );
-
-		sio::socket::ptr skt_ptr;
-		skt_ptr = __wsclient.socket();
-		skt_ptr->emit( Cmd, Data );
-	}
-
-	void wsClient::_on_close( sio::client::close_reason const & reason )
-	{
-		_reset();
-	}
-
-	void wsClient::_on_reconnect( unsigned p1, unsigned p2 )
-	{
-		_reset();
-	}
-
-	void wsClient::_on_fail()
-	{
-		_reset();
-	}
-
-	void wsClient::_on_socket_opened()
-	{
-		__SktOpened = true;
-	}
-
-	void wsClient::_OnCallMessage( std::string const& name, sio::message::ptr const& data, bool need_ack, sio::message::list &ack_resp )
-	{
-		if ( data->get_flag() == sio::message::flag_object ) 
-		{
-			std::string cmd = data->get_map()[JSON_ROOT_KEY_CMD]->get_string();
-
-			std::map<std::string, MSG_HANDLE_FUNC_TYPE>::iterator mit_func;
-			mit_func = __MsgFuncList.find( cmd );
-			if ( mit_func != __MsgFuncList.end() )
-			{
-				mit_func->second( GetID(), name, data, need_ack, ack_resp );
-			}
-		}
-	}
-
-	void wsClient::_OnLoginResponse( std::string const & name, sio::message::ptr const & data, bool need_ack, sio::message::list & ack_resp )
-	{
-		char szError[512] = { 0 };
-		int res_code = ( int ) data->get_map()["code"]->get_int();
-		switch ( res_code )
-		{
-			case -1:
-			{
-				__Logined = false;
-				sprintf( szError, "Login failed,code=%d", res_code );
-				__LastError = szError;
-				break;
-			}
-			case 0:
-			{
-				__Logined = true;
-				break;
-			}
-			default:
-				break;
-		}
-	}
-
-	int wsClient::GetID()
-	{
-		return __ID;
-	}
-
-	bool wsClient::IsConnected()
-	{
-		return __Connected;
-	}
-
-	bool wsClient::IsSktOpened()
-	{
-		return __SktOpened;
-	}
-
-	bool wsClient::IsLogined()
-	{
-		return __Logined;
-	}
-
-	void wsClient::close()
-	{
-		__wsclient.sync_close();
-	}
-
-	std::string wsClient::GetLastError()
-	{
-		return __LastError;
-	}
-}

+ 0 - 381
websocket_bak/wsClient.h

@@ -1,381 +0,0 @@
-/**
-* @brief
-websocket客户端类
-
-* @version
-  V 1.0.0
-
-* @author
-  王益俊
-
-* @date
-  创建时间:  2018-08-14\n
-
-* @note
-  2018-08-14  创建类。\n
-
-* @warning
-
-* @bug
-  
-*/
-
-#pragma once
-
-#include <string>
-#include <mutex>
-#include <condition_variable>
-#include <map>
-
-#include <rapidjson/writer.h>
-#include <rapidjson/stringbuffer.h>
-#include <rapidjson/prettywriter.h>
-
-#include <boost/function.hpp>
-#include <boost/bind.hpp>
-
-#include "sio_client.h"
-#include "jsonBuilder.h"
-
-namespace YA
-{
-	//消息处理函数类型
-	typedef boost::function<void( int, std::string const&, sio::message::ptr const&, bool, sio::message::list & )> MSG_HANDLE_FUNC_TYPE;
-
-	class wsClient
-	{
-	private:
-		sio::client __wsclient;//websocket客户端
-		int __ID;//唯一标识
-		std::string __uri;//连接字符串
-		bool __Connected;//是否连接上服务器端
-		bool __SktOpened;//Socket是否已打开
-		bool __Logined;//是否已登录成功
-		std::condition_variable_any __cond;//条件变量
-		std::mutex __lock;//锁(配合__cond)
-		std::string __LastError;//最新错误
-		std::map<std::string, MSG_HANDLE_FUNC_TYPE> __MsgFuncList;//消息处理函数列表(key是命令,value是处理函数)
-		std::recursive_mutex __send_lock;//发送锁
-		jsonBuilder __jsBuilder;//json构造器
-	protected:
-		/**
-		* @brief
-		重置状态函数。
-
-		* @param  无\n
-
-		* @return 无\n
-
-		* @note
-
-		* @warning
-
-		* @bug
-
-		*/
-		void _reset();
-		/**
-		* @brief
-		连接成功回调函数。
-
-		* @param  无\n
-
-		* @return 无\n
-
-		* @note
-
-		* @warning
-
-		* @bug
-
-		*/
-		void _on_connected();
-		/**
-		* @brief
-		连接关闭回调函数。
-
-		* @param  [in] sio::client::close_reason const& reason 关闭的原因\n
-
-		* @return 无\n
-
-		* @note
-
-		* @warning
-
-		* @bug
-
-		*/
-		void _on_close( sio::client::close_reason const& reason );
-		/**
-		* @brief
-		重连回调函数。
-
-		* @param  [in] unsigned p1 ???\n
-		* @param  [in] unsigned p2 ???\n
-
-		* @return 无\n
-
-		* @note
-
-		* @warning
-
-		* @bug
-
-		*/
-		void _on_reconnect( unsigned p1, unsigned p2 );
-		/**
-		* @brief
-		失败回调函数。
-
-		* @param  无\n
-
-		* @return 无\n
-
-		* @note
-
-		* @warning
-
-		* @bug
-
-		*/
-		void _on_fail();
-		/**
-		* @brief
-		socket打开成功回调函数。
-
-		* @param  无\n
-
-		* @return 无\n
-
-		* @note
-
-		* @warning
-
-		* @bug
-
-		*/
-		void _on_socket_opened();
-		/**
-		* @brief
-		收到服务器端CALL命令回调函数。
-
-		* @param  [in] std::string const& name  触发的名字\n
-		* @param  [in] sio::message::ptr const& data  收到的消息数据\n
-		* @param  [in] bool need_ack  是否需要应答\n
-		* @param  [in] sio::message::list &ack_resp  应答消息数据\n
-
-		* @return 无\n
-
-		* @note
-
-		* @warning
-
-		* @bug
-
-		*/
-		void _OnCallMessage( std::string const& name, sio::message::ptr const& data, bool need_ack, sio::message::list &ack_resp );
-		/**
-		* @brief
-		收到服务器端登录应答命令回调函数。
-
-		* @param  [in] std::string const& name  触发的名字\n
-		* @param  [in] sio::message::ptr const& data  收到的消息数据\n
-		* @param  [in] bool need_ack  是否需要应答\n
-		* @param  [in] sio::message::list &ack_resp  应答消息数据\n
-
-		* @return 无\n
-
-		* @note
-
-		* @warning
-
-		* @bug
-
-		*/
-		void _OnLoginResponse( std::string const& name, sio::message::ptr const& data, bool need_ack, sio::message::list &ack_resp );
-	public:
-		wsClient();
-		~wsClient();
-		/**
-		* @brief
-		初始化函数。
-
-		* @param  [in] int ID  当前客户端的唯一标识\n
-		* @param  [in] const std::string & uri  连接串\n
-		* @param  [in] const std::map<std::string, MSG_HANDLE_FUNC_TYPE>& MsgFuncList  消息处理函数\n
-
-		* @return 无\n
-
-		* @note
-
-		* @warning
-
-		* @bug
-
-		*/
-		void init( int ID, const std::string & uri, const std::map<std::string, MSG_HANDLE_FUNC_TYPE>& MsgFuncList );
-		/**
-		* @brief
-		获得连接字符串函数。
-
-		* @param  无\n
-
-		* @return 获得的连接字符串\n
-
-		* @note
-
-		* @warning
-
-		* @bug
-
-		*/
-		std::string get_uri();
-		/**
-		* @brief
-		;连接函数。
-
-		* @param  [in] int time_out  超时(单位:秒),默认是3秒\n
-
-		* @return 连接服务器是否成功\n
-		* @retval  0  成功\n
-        * @retval  -1  失败\n
-
-		* @note
-
-		* @warning
-
-		* @bug
-
-		*/
-		int connect( int time_out = 3 );
-		/**
-		* @brief
-		;登录函数。
-
-		* @param  无\n
-
-		* @return 无\n
-
-		* @note
-
-		* @warning
-
-		* @bug
-
-		*/
-		void login();
-		/**
-		* @brief
-		发送数据函数。
-
-		* @param  [in] const std::string & Cmd  要发送的命令\n
-		* @param  [in] const std::string& Data  要发送的数据\n
-
-		* @return 无\n
-
-		* @note
-
-		* @warning
-
-		* @bug
-
-		*/
-		void send( const std::string & Cmd, const std::string & Data );
-		/**
-		* @brief
-		获得ID函数。
-
-		* @param  无\n
-
-		* @return 获得的ID\n
-
-		* @note
-
-		* @warning
-
-		* @bug
-
-		*/
-		int GetID();
-		/**
-		* @brief
-		获得是否已连接服务器端函数。
-
-		* @param  无\n
-
-		* @return 是否已连接服务器\n
-
-		* @note
-
-		* @warning
-
-		* @bug
-
-		*/
-		bool IsConnected();
-		/**
-		* @brief
-		获得Socket是否已打开函数。
-
-		* @param  无\n
-
-		* @return Socket是否已打开\n
-
-		* @note
-
-		* @warning
-
-		* @bug
-
-		*/
-		bool IsSktOpened();
-		/**
-		* @brief
-		获得是否已登录成功函数。
-
-		* @param  无\n
-
-		* @return 是否已登录成功\n
-
-		* @note
-
-		* @warning
-
-		* @bug
-
-		*/
-		bool IsLogined();
-		/**
-		* @brief
-		关闭函数。
-
-		* @param  无\n
-
-		* @return 无\n
-
-		* @note
-
-		* @warning
-
-		* @bug
-
-		*/
-		void close();
-		/**
-		* @brief
-		获得最新错误函数。
-
-		* @param  无\n
-
-		* @return 无\n
-
-		* @note
-
-		* @warning
-
-		* @bug
-
-		*/
-		std::string GetLastError();
-	};
-}

+ 0 - 142
websocket_bak/wsClientMgr.cpp

@@ -1,142 +0,0 @@
-#include "wsClientMgr.h"
-
-namespace YA
-{
-	wsClientMgr::wsClientMgr()
-	{
-
-	}
-
-	wsClientMgr::~wsClientMgr()
-	{
-
-	}
-
-	void wsClientMgr::Build( const std::vector<std::string> uri_list, const std::map<std::string, MSG_HANDLE_FUNC_TYPE>& MsgFuncList )
-	{
-		std::lock_guard<std::recursive_mutex> lock( __lock );
-
-		std::vector<std::string>::const_iterator vit_uri;
-
-		int ID = 1;
-		int Index = 0;
-		for ( vit_uri = uri_list.begin(); vit_uri != uri_list.end(); vit_uri++ )
-		{
-			std::shared_ptr<wsClient> pClient = std::make_shared<wsClient>();
-			pClient->init( ID, *vit_uri, MsgFuncList );
-			__wsClientList.push_back( pClient );
-			__uriIndexList.insert( std::make_pair( *vit_uri, Index ) );
-			ID++;
-			Index++;
-		}
-	}
-
-	int wsClientMgr::connect( int time_out )
-	{
-		std::lock_guard<std::recursive_mutex> lock( __lock );
-
-		for ( size_t i = 0; i < __wsClientList.size() ; i++ )
-		{
-			if ( __wsClientList[i]->connect( time_out ) != 0 )
-			{
-				char szError[1024] = { 0 };
-				sprintf( szError, "[%d] websocket client failed to connect: %s.", __wsClientList[i]->GetID(), __wsClientList[i]->get_uri().c_str() );
-				__LastError = szError;
-				return -1;
-			}
-		}
-
-		return 0;
-	}
-
-	void wsClientMgr::login()
-	{
-		std::lock_guard<std::recursive_mutex> lock( __lock );
-
-		for ( size_t i = 0; i < __wsClientList.size() ; i++ )
-		{
-			__wsClientList[i]->login();
-		}
-	}
-
-	void wsClientMgr::send( const std::string & Cmd, const std::string & Data )
-	{
-		std::lock_guard<std::recursive_mutex> lock( __lock );
-
-		for ( size_t i = 0; i < __wsClientList.size() ; i++ )
-		{
-			__wsClientList[i]->send( Cmd, Data );
-		}
-	}
-
-	std::shared_ptr<wsClient> wsClientMgr::GetClientByURI( const std::string & URI )
-	{
-		std::lock_guard<std::recursive_mutex> lock( __lock );
-
-		std::shared_ptr<wsClient> pClient;
-
-		std::map<std::string, int>::iterator mit_uri;
-		mit_uri = __uriIndexList.find( URI );
-		if ( mit_uri != __uriIndexList.end() )
-		{
-			pClient = __wsClientList[mit_uri->second];
-		}
-
-		return pClient;
-	}
-
-	void wsClientMgr::close()
-	{
-		std::lock_guard<std::recursive_mutex> lock( __lock );
-
-		for ( size_t i = 0; i < __wsClientList.size() ; i++ )
-		{
-			__wsClientList[i]->close();
-		}
-	}
-
-	bool wsClientMgr::IsConnected()
-	{
-		std::lock_guard<std::recursive_mutex> lock( __lock );
-
-		for ( size_t i = 0; i < __wsClientList.size() ; i++ )
-		{
-			if ( !__wsClientList[i]->IsConnected() )
-			{
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	bool wsClientMgr::IsLogined()
-	{
-		std::lock_guard<std::recursive_mutex> lock( __lock );
-
-		for ( size_t i = 0; i < __wsClientList.size() ; i++ )
-		{
-			if ( !__wsClientList[i]->IsLogined() )
-			{
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	bool wsClientMgr::IsSktOpened()
-	{
-		std::lock_guard<std::recursive_mutex> lock( __lock );
-
-		for ( size_t i = 0; i < __wsClientList.size() ; i++ )
-		{
-			if ( !__wsClientList[i]->IsSktOpened() )
-			{
-				return false;
-			}
-		}
-
-		return true;
-	}
-}

+ 0 - 232
websocket_bak/wsClientMgr.h

@@ -1,232 +0,0 @@
-/**
-* @brief
-websocket客户端管理器类
-
-* @version
-  V 1.0.0
-
-* @author
-  王益俊
-
-* @date
-  创建时间:  2018-08-17\n
-
-* @note
-  2018-08-17  创建类。\n
-
-* @warning
-
-* @bug
-  
-*/
-
-#pragma once
-
-#include <vector>
-#include <string>
-#include <map>
-
-#include "wsClient.h"
-#include <boost/serialization/singleton.hpp>
-
-namespace YA
-{
-	class wsClientMgr
-	{
-	private:
-		std::vector<std::shared_ptr<wsClient>> __wsClientList;//ws客户端列表
-		std::map<std::string,int>  __uriIndexList;//uri和客户端下标对应表
-		std::string __LastError;//最新错误
-		std::recursive_mutex __lock;//锁
-	public:
-		wsClientMgr();
-		~wsClientMgr();
-		/**
-		* @brief
-		  重载[]运算符。
-
-		* @param  [in] int index  下标\n
-
-		* @return 下标对应的客户端\n
-
-		* @note
-
-		* @warning
-
-		* @bug
-
-		*/
-		std::shared_ptr<wsClient> operator[]( int index )
-		{
-			std::lock_guard<std::recursive_mutex> lock( __lock );
-			std::shared_ptr<wsClient> pClient;
-
-			if ( index < 0 )
-			{
-				return pClient;
-			}
-
-			if ( index <(int) __wsClientList.size() )
-			{
-				pClient = __wsClientList[index];
-			}
-
-			return pClient;
-		}
-		/**
-		* @brief
-		;构造函数。
-
-		* @param  [in] const std::vector<std::string> uri_list  服务器uri列表\n
-		* @param  [in] const std::map<std::string, MSG_HANDLE_FUNC_TYPE>& MsgFuncList  处理函数列表\n
-
-		* @return 连接服务器是否成功\n
-		* @retval  0  成功\n
-        * @retval  -1  失败\n
-
-		* @note
-
-		* @warning
-
-		* @bug
-
-		*/
-		void Build( const std::vector<std::string> uri_list, const std::map<std::string, MSG_HANDLE_FUNC_TYPE>& MsgFuncList );
-		/**
-		* @brief
-		;连接函数。
-
-		* @param  [in] int time_out  超时(单位:秒),默认是3秒\n
-
-		* @return 连接服务器是否成功\n
-		* @retval  0  成功\n
-        * @retval  -1  失败\n
-
-		* @note
-
-		* @warning
-
-		* @bug
-
-		*/
-		int connect( int time_out = 3 );
-		/**
-		* @brief
-		;登录函数。
-
-		* @param  无\n
-
-		* @return 无\n
-
-		* @note
-
-		* @warning
-
-		* @bug
-
-		*/
-		void login();
-		/**
-		* @brief
-		发送数据函数。
-
-		* @param  [in] const std::string & Cmd  要发送的命令\n
-		* @param  [in] const std::string& Data  要发送的数据\n
-
-		* @return 无\n
-
-		* @note
-
-		* @warning
-
-		* @bug
-
-		*/
-		void send( const std::string & Cmd, const std::string & Data );
-		/**
-		* @brief
-		根据URI(连接串)获得对应的客户端函数。
-
-		* @param  [in] const std::string& URI  \n
-
-		* @return 获得的客户端\n
-
-		* @note
-
-		* @warning
-
-		* @bug
-
-		*/
-		std::shared_ptr<wsClient> GetClientByURI( const std::string& URI );
-		/**
-		* @brief
-		关闭函数。
-
-		* @param  无\n
-
-		* @return 无\n
-
-		* @note
-
-		* @warning
-
-		* @bug
-
-		*/
-		void close();
-		/**
-		* @brief
-		获得是否已连接服务器端函数。
-
-		* @param  无\n
-
-		* @return 是否已连接服务器\n
-
-		* @note
-
-		* @warning
-
-		* @bug
-
-		*/
-		bool IsConnected();
-		/**
-		* @brief
-		获得是否已登录成功函数。
-
-		* @param  无\n
-
-		* @return 是否已登录成功\n
-
-		* @note
-
-		* @warning
-
-		* @bug
-
-		*/
-		bool IsLogined();
-		/**
-		* @brief
-		获得Socket是否已打开函数。
-
-		* @param  无\n
-
-		* @return Socket是否已打开\n
-
-		* @note
-
-		* @warning
-
-		* @bug
-
-		*/
-		bool IsSktOpened();
-	};
-}
-
-//单件相关定义
-typedef boost::serialization::singleton<YA::wsClientMgr> singleton_wsClientMgr;
-#define swsClientMgr singleton_wsClientMgr::get_mutable_instance()
-#define swsClientMgr_const singleton_wsClientMgr::get_const_instance()

+ 0 - 81
websocket_bak/wsTimerThread.cpp

@@ -1,81 +0,0 @@
-#include "wsTimerThread.h"
-#include <iostream>
-
-namespace YA
-{
-	wsTimerThread::wsTimerThread()
-	{
-		__Reset();
-	}
-
-
-	wsTimerThread::~wsTimerThread()
-	{
-		Stop();
-	}
-
-	void wsTimerThread::Start()
-	{
-		__Running = true;
-		__Thread.reset( new boost::thread( boost::bind( &wsTimerThread::_ThreadFunc, this, this ) ) );
-		__Thread->detach();
-	}
-
-	void wsTimerThread::Stop()
-	{
-		__Enable = false;
-
-		boost::unique_lock<boost::mutex> lock( __ExitMutex );
-		__ExitCond.wait( lock );
-
-		__Running = false;
-	}
-
-	void wsTimerThread::__Reset()
-	{
-		__Enable  = true;
-		__Running = false;
-	}
-
-	void wsTimerThread::__ChkConfig()
-	{
-		if ( __Config.SendInterval < MIN_SEND_INTERVAL )
-		{
-			__Config.SendInterval = MIN_SEND_INTERVAL;
-		}
-	}
-	void wsTimerThread::_ThreadFunc( wsTimerThread * pOwner )
-	{
-		while ( pOwner->__Enable )
-		{
-			//do something...
-			printf("doing ....timer thread .......\n");
-			boost::this_thread::sleep( boost::posix_time::millisec( 1000 ) );
-		}
-
-		pOwner->__ExitCond.notify_one();
-	}
-
-
-
-	void wsTimerThread::Init( const _THREAD_CONFIG_ & Config )
-	{
-		__Config = Config;
-		__ChkConfig();
-	}
-
-	void wsTimerThread::add_card_pos( const _CARD_POS_ & pos )
-	{
-		__CardPosList.insert( pos.ID, pos );
-	}
-
-	void wsTimerThread::upt_card_pos( const _CARD_POS_ & pos )
-	{
-		__CardPosList.update( pos.ID, pos );
-	}
-
-	void wsTimerThread::del_card_pos( const _CARD_POS_ & pos )
-	{
-		__CardPosList.erase( pos.ID );
-	}
-}

+ 0 - 202
websocket_bak/wsTimerThread.h

@@ -1,202 +0,0 @@
-/**
-* @brief
-websocket定时发送线程类
-
-* @version
-  V 1.0.0
-
-* @author
-  王益俊
-
-* @date
-  创建时间:  2018-08-17\n
-
-* @note
-  2018-08-17  创建类。\n
-
-* @warning
-
-* @bug
-  
-*/
-
-#pragma once
-
-#include <boost/thread.hpp>
-#include <boost/bind.hpp>
-#include <boost/atomic.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/thread/condition.hpp>
-#include <boost/serialization/singleton.hpp>
-
-#include "thread_safe_map.h"
-#include "ws_common.h"
-
-namespace YA
-{
-	class wsTimerThread
-	{
-	private:
-		boost::shared_ptr<boost::thread> __Thread;//线程
-		boost::atomic<bool> __Enable;//线程是否继续运行的标志
-		boost::atomic<bool> __Running;//线程是否正在运行的标志
-		boost::condition_variable_any __ExitCond;//条件变量
-		boost::mutex __ExitMutex;//锁(配合__ExitCond)
-		_THREAD_CONFIG_ __Config;//线程配置
-		thread_safe_map<int, _CARD_POS_> __CardPosList;//卡位置列表
-	private:
-		/**
-		* @brief
-		  重置函数。
-
-		* @param  无\n
-
-		* @return 无\n
-
-		* @note
-
-		* @warning
-
-		* @bug
-
-		*/
-		void __Reset();
-		/**
-		* @brief
-		  检查线程配置是否合法函数。
-
-		* @param  无\n
-
-		* @return 无\n
-
-		* @note
-
-		* @warning
-
-		* @bug
-
-		*/
-		void __ChkConfig();
-	protected:
-		/**
-		* @brief
-		  线程函数。
-
-		* @param  [in] wsTimerThread* pOwner  线程所属者\n
-
-		* @return 无\n
-
-		* @note
-
-		* @warning
-
-		* @bug
-
-		*/
-		void _ThreadFunc( wsTimerThread* pOwner );
-	public:
-		wsTimerThread();
-		~wsTimerThread();
-		/**
-		* @brief
-		  启动线程函数。
-
-		* @param  无\n
-
-		* @return 无\n
-
-		* @note
-
-		* @warning
-
-		* @bug
-
-		*/
-		void Start();
-		/**
-		* @brief
-		  停止线程函数。
-
-		* @param  无\n
-
-		* @return 无\n
-
-		* @note
-
-		* @warning
-
-		* @bug
-
-		*/
-		void Stop();
-		/**
-		* @brief
-		  初始化函数。
-
-		* @param  [in] const _THREAD_CONFIG_& Config  线程配置\n
-
-		* @return 无\n
-
-		* @note
-
-		* @warning
-
-		* @bug
-
-		*/
-		void Init( const _THREAD_CONFIG_& Config );
-		/**
-		* @brief
-		  添加卡位置函数。
-
-		* @param  [in] const _CARD_POS_& pos  卡位置结构体\n
-
-		* @return 无\n
-
-		* @note
-
-		* @warning
-
-		* @bug
-
-		*/
-		void add_card_pos( const _CARD_POS_& pos );
-		/**
-		* @brief
-		  更新卡位置函数。
-
-		* @param  [in] const _CARD_POS_& pos  卡位置结构体\n
-
-		* @return 无\n
-
-		* @note
-
-		* @warning
-
-		* @bug
-
-		*/
-		void upt_card_pos( const _CARD_POS_& pos );
-		/**
-		* @brief
-		  删除卡位置函数。
-
-		* @param  [in] const _CARD_POS_& pos  卡位置结构体\n
-
-		* @return 无\n
-
-		* @note
-
-		* @warning
-
-		* @bug
-
-		*/
-		void del_card_pos( const _CARD_POS_& pos );
-	};
-}
-
-//单件定义
-typedef boost::serialization::singleton<YA::wsTimerThread> singleton_wsTimerThread;
-#define swsTimerThrd singleton_wsTimerThread::get_mutable_instance()
-#define swsTimerThrd_const singleton_wsTimerThread::get_const_instance()

+ 0 - 77
websocket_bak/ws_common.h

@@ -1,77 +0,0 @@
-/**
-* @brief
-  websocket公共头文件
-
-* @version
-  V 1.0.0
-
-* @author
-  王益俊
-
-* @date
-  创建时间:  2018-08-17\n
-
-* @note
-  2018-08-17  初次创建。\n
-
-* @warning
-
-* @bug
-  
-*/
-
-#ifndef _WS_COMMON_INC_H_
-#define _WS_COMMON_INC_H_
-
-namespace YA
-{
-	const int MIN_SEND_INTERVAL = 2;
-
-	/**
-	* @brief
-	线程配置结构体。
-	*/
-	struct _THREAD_CONFIG_
-	{
-		int SendInterval;//发送间隔(单位:秒)
-		void Clear()
-		{
-			SendInterval = 0;
-		}
-		_THREAD_CONFIG_()
-		{
-			Clear();
-		}
-	};
-
-	/**
-	* @brief
-	卡位置结构体。
-	*/
-	struct _CARD_POS_
-	{
-		int Type;//卡类型
-		int ID;//卡ID
-		double x;//x坐标
-		double y;//y坐标
-		double z;//z坐标
-		double speed;
-		int    stat;
-		void Clear()
-		{
-			Type = 0;
-			ID   = 0;
-			x    = 0.0;
-			y    = 0.0;
-			z    = 0.0;
-			speed = 0;
-			stat = 0;
-		}
-		_CARD_POS_()
-		{
-			Clear();
-		}
-	};
-}
-
-#endif