Browse Source

fix merge

zhuyf 2 years ago
parent
commit
8aa9f67079
11 changed files with 2663 additions and 492 deletions
  1. 1 1
      COPYING
  2. 1 1
      INSTALL
  3. 10 10
      config.h
  4. 953 149
      configure
  5. 25 14
      configure.ac
  6. 1 1
      db/COPYING
  7. 1 1
      db/INSTALL
  8. 2 3
      db/Makefile.am
  9. 1597 302
      db/configure
  10. 16 5
      db/configure.ac
  11. 56 5
      websocket/configure

+ 1 - 1
COPYING

@@ -1 +1 @@
-/usr/share/automake-1.12/COPYING
+/usr/share/automake-1.13/COPYING

+ 1 - 1
INSTALL

@@ -1 +1 @@
-/usr/share/automake-1.12/INSTALL
+/usr/share/automake-1.13/INSTALL

+ 10 - 10
config.h

@@ -63,7 +63,7 @@
 
 /* Define to 1 if your system has a GNU libc compatible `malloc' function, and
    to 0 otherwise. */
-#define HAVE_MALLOC 0
+#define HAVE_MALLOC 1
 
 /* Define to 1 if you have the `memmove' function. */
 #define HAVE_MEMMOVE 1
@@ -85,7 +85,7 @@
 
 /* Define to 1 if your system has a GNU libc compatible `realloc' function,
    and to 0 otherwise. */
-#define HAVE_REALLOC 0
+#define HAVE_REALLOC 1
 
 /* Define to 1 if you have the `socket' function. */
 #define HAVE_SOCKET 1
@@ -133,19 +133,19 @@
 #define HAVE__BOOL 1
 
 /* Name of package */
-#define PACKAGE "yals"
+#define PACKAGE "3xls"
 
 /* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "BUG-REPORT-ADDRESS"
+#define PACKAGE_BUGREPORT "zhuyunfei@zh3x.cn"
 
 /* Define to the full name of this package. */
-#define PACKAGE_NAME "yals"
+#define PACKAGE_NAME "3xls"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "yals 1.0"
+#define PACKAGE_STRING "3xls 1.0"
 
 /* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "yals"
+#define PACKAGE_TARNAME "3xls"
 
 /* Define to the home page for this package. */
 #define PACKAGE_URL ""
@@ -154,7 +154,7 @@
 #define PACKAGE_VERSION "1.0"
 
 /* Define to 1 if you have the ANSI C header files. */
-/* #undef STDC_HEADERS */
+#define STDC_HEADERS 1
 
 /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
 #define TIME_WITH_SYS_TIME 1
@@ -200,10 +200,10 @@
 /* #undef int8_t */
 
 /* Define to rpl_malloc if the replacement function should be used. */
-#define malloc rpl_malloc
+/* #undef malloc */
 
 /* Define to rpl_realloc if the replacement function should be used. */
-#define realloc rpl_realloc
+/* #undef realloc */
 
 /* Define to `unsigned int' if <sys/types.h> does not define. */
 /* #undef size_t */

File diff suppressed because it is too large
+ 953 - 149
configure


+ 25 - 14
configure.ac

@@ -2,22 +2,36 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT([yals], [1.0], [BUG-REPORT-ADDRESS])
-AC_CONFIG_SRCDIR([main.cpp])
+AC_INIT([3xls], [1.0], [zhuyunfei@zh3x.cn])
+AC_CONFIG_SRCDIR([ant.cpp])
+AC_CONFIG_HEADERS([config.h])
 
-AM_INIT_AUTOMAKE([foreign -Wall])
-AC_CONFIG_MACRO_DIR([m4])
+AM_INIT_AUTOMAKE
 
 # Checks for programs.
 AC_PROG_CXX
 AC_PROG_CC
-AC_PROG_RANLIB
 
+# Checks for libraries.
+# FIXME: Replace `main' with a function in `-lboost_chrono':
+AC_CHECK_LIB([boost_chrono], [main])
+# FIXME: Replace `main' with a function in `-lboost_system':
+AC_CHECK_LIB([boost_system], [main])
+# FIXME: Replace `main' with a function in `-lboost_thread':
+AC_CHECK_LIB([boost_thread], [main])
+# FIXME: Replace `main' with a function in `-lev':
 AC_CHECK_LIB([ev], [main])
+# FIXME: Replace `main' with a function in `-lmysqlclient':
+AC_CHECK_LIB([mysqlclient], [main])
+# FIXME: Replace `main' with a function in `-lrt':
+AC_CHECK_LIB([rt], [main])
+# FIXME: Replace `main' with a function in `-lthree_rates':
+AC_CHECK_LIB([three_rates], [main])
+# FIXME: Replace `main' with a function in `-lzlog':
 AC_CHECK_LIB([zlog], [main])
 
 # Checks for header files.
-AC_CHECK_HEADERS([arpa/inet.h fcntl.h netinet/in.h stdint.h string.h sys/socket.h unistd.h])
+AC_CHECK_HEADERS([arpa/inet.h fcntl.h float.h limits.h memory.h netinet/in.h stdint.h stdlib.h string.h sys/socket.h sys/time.h unistd.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_CHECK_HEADER_STDBOOL
@@ -34,14 +48,11 @@ AC_TYPE_UINT8_T
 
 # Checks for library functions.
 AC_FUNC_MALLOC
+AC_FUNC_MKTIME
 AC_FUNC_REALLOC
-AC_CHECK_FUNCS([inet_ntoa memset socket])
+AC_CHECK_FUNCS([alarm atexit clock_gettime floor gettimeofday inet_ntoa localtime_r memmove memset mkdir pow socket sqrt stime strchr strstr])
 
-AC_CONFIG_FILES([
-	db/Makefile
-	websocket/Makefile
-	Makefile
-])
+AC_CONFIG_FILES([Makefile])
+AC_CONFIG_SUBDIRS([db
+                   websocket])
 AC_OUTPUT
-
-

+ 1 - 1
db/COPYING

@@ -1 +1 @@
-/usr/share/automake-1.12/COPYING
+/usr/share/automake-1.13/COPYING

+ 1 - 1
db/INSTALL

@@ -1 +1 @@
-/usr/share/automake-1.12/INSTALL
+/usr/share/automake-1.13/INSTALL

+ 2 - 3
db/Makefile.am

@@ -2,10 +2,9 @@ AUTOMAKE_OPTIONS=foreign
 
 lib_LIBRARIES=libyadb.a
 
-
 CXXFLAGS=-fPIC -g
-AM_CPPFLAGS=-Wall -pthread -m64 -std=c++11  -I${prefix}/include -I../../dist/include -I../../rapidjson/include -I/usr/local/include/mysql -I. -I.. -I../websocket/sio
-AM_LDFLAGS =-Wall -pthread -m64 -std=c++11  -L${prefix}/lib  -L/usr/local/mysql/lib
+AM_CPPFLAGS=-Wall -pthread -m64 -std=c++11  -I${prefix}/include  -I${prefix}/include/rapidjson -I${prefix}/include/mysql -I. -I..
+AM_LDFLAGS =-Wall -pthread -m64 -std=c++11  -L${prefix}/lib  -L${prefix}/mysql/lib
 
 libyadb_a_SOURCES= db_card.cpp db_api/CDBResultSet.cpp db_api/CDBConnect.cpp \
 				   db_api/CDBHelper.cpp db_api/CDBConnPool.cpp db_tool.cpp db_area.cpp db_history.cpp

File diff suppressed because it is too large
+ 1597 - 302
db/configure


+ 16 - 5
db/configure.ac

@@ -3,18 +3,29 @@
 
 AC_PREREQ([2.69])
 AC_INIT([libyadb.a], [1.0], [BUG-REPORT-ADDRESS])
-AC_CONFIG_SRCDIR([db_tool.cpp])
+AC_CONFIG_SRCDIR([db_area.cpp])
+AC_CONFIG_HEADERS([config.h])
 
 AM_INIT_AUTOMAKE
-AC_CONFIG_MACRO_DIR([m4])
-
 # 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_INT32_T
+AC_TYPE_UINT32_T
+AC_TYPE_UINT64_T
+
+# Checks for library functions.
+AC_CHECK_FUNCS([memset])
+
 AC_PROG_RANLIB
 
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
-
-

+ 56 - 5
websocket/configure

@@ -613,6 +613,10 @@ CPPFLAGS
 LDFLAGS
 CXXFLAGS
 CXX
+AM_BACKSLASH
+AM_DEFAULT_VERBOSITY
+AM_DEFAULT_V
+AM_V
 am__untar
 am__tar
 AMTAR
@@ -677,6 +681,7 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
+enable_silent_rules
 enable_dependency_tracking
 '
       ac_precious_vars='build_alias
@@ -1304,6 +1309,8 @@ Optional Features:
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --enable-silent-rules   less verbose build output (undo: "make V=1")
+  --disable-silent-rules  verbose build output (undo: "make V=0")
   --enable-dependency-tracking
                           do not reject slow dependency extractors
   --disable-dependency-tracking
@@ -1829,7 +1836,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-am__api_version='1.12'
+am__api_version='1.13'
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -2042,8 +2049,8 @@ if test x"${MISSING+set}" != xset; then
   esac
 fi
 # Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
+if eval "$MISSING --is-lightweight"; then
+  am_missing_run="$MISSING "
 else
   am_missing_run=
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
@@ -2283,6 +2290,45 @@ else
 fi
 rmdir .tst 2>/dev/null
 
+# Check whether --enable-silent-rules was given.
+if test "${enable_silent_rules+set}" = set; then :
+  enableval=$enable_silent_rules;
+fi
+
+case $enable_silent_rules in # (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=1;;
+esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  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
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+    AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AM_BACKSLASH='\'
+
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
   # is not polluted with repeated "-I."
@@ -2345,6 +2391,10 @@ mkdir_p='$(MKDIR_P)'
 # in the wild :-(  We should find a proper way to deprecate it ...
 AMTAR='$${TAR-tar}'
 
+
+# We'll loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar  pax cpio none'
+
 am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
 
 
@@ -2353,6 +2403,7 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
 
 
 
+
 # Checks for programs.
 ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
@@ -4992,7 +5043,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
 
   case $ac_file$ac_mode in
     "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+  # Older Autoconf 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
@@ -5043,7 +5094,7 @@ $as_echo X"$mf" |
     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
     test -z "$DEPDIR" && continue
     am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "am__include" && continue
+    test -z "$am__include" && continue
     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
     # Find all dependency output files, they are included files with
     # $(DEPDIR) in their names.  We invoke sed twice because it is the