Browse Source

初始化变量

lixioayao 6 years ago
parent
commit
89fadd4fdf
4 changed files with 6 additions and 3 deletions
  1. 1 0
      Makefile.am
  2. 3 1
      configure
  3. 1 1
      configure.ac
  4. 1 1
      select_tool.h

+ 1 - 0
Makefile.am

@@ -1,3 +1,4 @@
+SUBDIRS=db websocket
 bin_PROGRAMS=yals 
 noinst_PROGRAMS=client async test 
 

+ 3 - 1
configure

@@ -5139,7 +5139,7 @@ fi
 done
 
 
-ac_config_files="$ac_config_files Makefile"
+ac_config_files="$ac_config_files db/Makefile websocket/Makefile Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -5887,6 +5887,8 @@ for ac_config_target in $ac_config_targets
 do
   case $ac_config_target in
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+    "db/Makefile") CONFIG_FILES="$CONFIG_FILES db/Makefile" ;;
+    "websocket/Makefile") CONFIG_FILES="$CONFIG_FILES websocket/Makefile" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;

+ 1 - 1
configure.ac

@@ -36,7 +36,7 @@ AC_FUNC_MALLOC
 AC_FUNC_REALLOC
 AC_CHECK_FUNCS([inet_ntoa memset socket])
 
-AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([db/Makefile websocket/Makefile Makefile])
 AC_OUTPUT
 
 

+ 1 - 1
select_tool.h

@@ -758,7 +758,7 @@ struct smooth_tool
 	point smooth_last_true_position;
 
 	line smooth_line;
-	bool smooth_line_reset;	//if line reset
+	bool smooth_line_reset=false;	//if line reset
 
 	bool smooth_halt_condition;	//if halting
 	int smooth_halt_count;	//halting count